Thulinma
|
6b2a158d9c
|
Backported various fixes by Erik Zandvliet, also added better handling of re-pushes.
|
2015-05-21 20:15:09 +02:00 |
|
Thulinma
|
993801789a
|
Merge branch 'development' into LTS_development
|
2015-05-21 19:16:22 +02:00 |
|
Thulinma
|
17aa6bbbb6
|
Compatibility improvements as well as simplification to RTMP push input.
|
2015-05-21 19:10:05 +02:00 |
|
Erik Zandvliet
|
926dd01995
|
Fixed removing pages at the right points.
|
2015-05-20 14:45:38 +02:00 |
|
Thulinma
|
657d7ad7ca
|
Fixed MP4 playback problems with zero-length parts (Mantrics playback issue).
|
2015-05-11 19:02:00 +02:00 |
|
Thulinma
|
6f933bdb97
|
Fixed live pushing when more than 2 tracks present.
|
2015-05-07 12:02:49 +02:00 |
|
Thulinma
|
77dcfc23ad
|
Removed remaining recording code.
|
2015-04-28 09:39:01 +02:00 |
|
Thulinma
|
c96f0fb9e4
|
Merge branch 'development' into LTS_development
|
2015-04-21 17:14:51 +02:00 |
|
Thulinma
|
acc462c281
|
Minor edit to live buffer semaphore naming.
|
2015-04-21 17:14:13 +02:00 |
|
Thulinma
|
9b683f6ee3
|
Merge branch 'development' into LTS_development
|
2015-04-15 13:49:18 +02:00 |
|
Thulinma
|
73b1f2d75c
|
Prevented deleting live tracks too soon.
|
2015-04-15 13:49:12 +02:00 |
|
Thulinma
|
818ffbed33
|
Merge branch 'development' into LTS_development
|
2015-04-14 17:33:35 +02:00 |
|
Thulinma
|
f86476153e
|
Fixed live semaphore problems.
|
2015-04-14 17:33:30 +02:00 |
|
Thulinma
|
3489d1ee34
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-04-14 15:32:05 +02:00 |
|
Thulinma
|
69cf17d01d
|
Increased maximum simultaneous tracks from 5 to 10, made this a define option. Allow multiple pushes through a single RTMP connection.
|
2015-04-14 15:30:25 +02:00 |
|
Thulinma
|
514f0a9b2b
|
Fixes to AC3, MP3, 4+GiB MP4 and MP4 B-frames by Oswald de Bruin
|
2015-04-07 14:38:39 +02:00 |
|
Thulinma
|
4bdbd82f66
|
LTS Commits
|
2015-04-05 21:38:36 +02:00 |
|
Erik Zandvliet
|
d370ef4eac
|
Working multi-input
|
2015-04-02 09:56:47 +02:00 |
|
Thulinma
|
cf52b6bbcc
|
Added support for space as a stream separator character.
|
2015-03-13 01:05:01 +01:00 |
|
Thulinma
|
39f06dc99a
|
Added MP3 input support (coded by Erik Zandvliet)
|
2015-03-10 12:52:44 +01:00 |
|
Thulinma
|
96328cd035
|
Changed default buffer size to 50s from 30s
|
2015-03-06 12:48:23 +01:00 |
|
Thulinma
|
35ddc79c1a
|
added pid/timeout/kill functionality to stats
# Conflicts:
# src/output/output_rtmp.cpp
|
2015-03-03 11:33:52 +01:00 |
|
Thulinma
|
4586289c83
|
Changed type of debug setting for inputs/outputs to "debug" instead of "uint".
|
2015-02-20 17:05:51 +01:00 |
|
Thulinma
|
aa00b31ddb
|
Changes for new ESDS implementation in library.
|
2015-02-18 02:55:21 +01:00 |
|
Erik Zandvliet
|
cc004dd5bb
|
Fixed erasing pages from index when they are no longer in use
|
2015-02-13 22:14:54 +01:00 |
|
wouter spruit
|
30866407e0
|
added memrchr function for mac
|
2015-02-12 15:38:39 +01:00 |
|
wouter spruit
|
2c17b7a1e7
|
fixed compiler warnings and wrong for i loops
|
2015-02-12 15:38:39 +01:00 |
|
Thulinma
|
109fa4d91f
|
Live streams: Added error message in case index entries run out, fixed index entries running out.
|
2015-02-09 21:44:37 +01:00 |
|
Thulinma
|
a555c5b43c
|
Fixed several --json misconfigurations in inputs.
|
2015-02-06 00:42:43 +01:00 |
|
Thulinma
|
39a386ab18
|
Stability improvements for live buffers / fixed issues with file extensions in RTMP stream names.
|
2015-01-29 01:28:46 +01:00 |
|
Thulinma
|
9bdf5ee19b
|
Made page and metadata sizes variable in Windows, as they are on other platforms.
|
2015-01-27 13:21:09 +01:00 |
|
Thulinma
|
43d35cf29b
|
Converted previously hardcoded default sizes for shared memory pages to defines.
|
2015-01-27 12:03:52 +01:00 |
|
Thulinma
|
e70a5c106d
|
Decrease debug message verbosity levels.
|
2015-01-15 10:20:49 +01:00 |
|
ozzay
|
a3ae7c365f
|
Semaphore will not appear when in converter mode
|
2014-12-23 13:12:26 +01:00 |
|
Thulinma
|
a47504b5cb
|
Ogg support fixed and re-added. Squash of various commits made by Wouter Spruit.
|
2014-12-23 13:10:28 +01:00 |
|
Thulinma
|
85fe9d1713
|
Fixed slow input buffer shutdown.
|
2014-12-15 18:13:38 +01:00 |
|
Thulinma
|
3030be0384
|
Optimized file output from all MistIn* processes.
|
2014-12-13 00:14:51 +01:00 |
|
Thulinma
|
cb088f68b0
|
Fixed MistIn conversion mode.
|
2014-12-09 14:48:04 +01:00 |
|
Thulinma
|
2769e41258
|
Fixed keysizes not being properly wiped when the stream buffer is.
|
2014-12-05 21:40:36 +01:00 |
|
Erik Zandvliet
|
17a93fe927
|
Indentation fix + last page buffer fix
|
2014-12-05 13:21:39 +01:00 |
|
Erik Zandvliet
|
0b4c4f70ec
|
Minor fixes
|
2014-12-04 09:50:23 +01:00 |
|
Erik Zandvliet
|
1743dcb93d
|
Fix for using old files.
|
2014-12-03 14:01:09 +01:00 |
|
Erik Zandvliet
|
c2a0d95f2b
|
Fix for not having to read through the entire file on startup of input.
|
2014-12-02 12:43:13 +01:00 |
|
Thulinma
|
1f83e1d5b4
|
Fixed commit mistake.
|
2014-11-26 10:00:36 +01:00 |
|
Thulinma
|
8d4639c8c6
|
Better method for setting bufferTime.
|
2014-11-24 15:55:50 +01:00 |
|
Thulinma
|
a2f16d9fac
|
Lowered input debug message verbosity levels.
|
2014-10-31 19:37:40 +01:00 |
|
Thulinma
|
e6e76d3971
|
Fixed input buffering packet mismatch problems.
|
2014-10-31 19:25:53 +01:00 |
|
Thulinma
|
c26661b690
|
Fixed hostname in statistics to properly be in packed binary format, internally.
|
2014-10-22 16:51:51 +02:00 |
|
wouter spruit
|
ba3880d78d
|
Fixed recording some more some more.
|
2014-10-16 09:37:38 +02:00 |
|
Thulinma
|
8542281ac2
|
JSON-based input selection.
|
2014-10-02 16:12:19 +02:00 |
|