Commit graph

142 commits

Author SHA1 Message Date
Thulinma
9e1539a2b9 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_statistics.cpp
#	src/input/input_buffer.cpp
#	src/input/input_dtsc.cpp
#	src/input/input_ebml.cpp
#	src/input/input_flv.cpp
#	src/input/input_mp3.cpp
#	src/output/output_httpts.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_progressive_mp4.cpp
2019-01-25 23:57:42 +01:00
Thulinma
7565704fdc Fixed 32-bit compile issues 2019-01-25 23:49:56 +01:00
Erik Zandvliet
10fa4b7e7b libmist backport from new metadata branch with improved typing and styling 2018-12-06 11:07:07 +01:00
Erik Zandvliet
2607113727 Library code style update + some minor backports from Pro edition 2018-12-04 13:11:48 +01:00
Thulinma
98e3940079 Robustify accesses to server config 2018-11-28 11:46:33 +01:00
Thulinma
ac92e09262 Robustify accesses to server config 2018-11-28 11:46:22 +01:00
Thulinma
6a5549444b Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
#	src/output/output_ts_base.cpp
2018-11-01 16:37:03 +01:00
Thulinma
24006648f9 Cleaned up, fixed and robustified semaphore and signal related code 2018-11-01 16:11:47 +01:00
Thulinma
ce1eef0885 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
#	src/input/input_buffer.cpp
#	src/output/output.cpp
#	src/output/output_progressive_mp4.cpp
#	src/output/output_rtmp.cpp
2018-10-15 10:53:03 +02:00
Thulinma
776cfe1850 Backported various Pro edition changes and general code to Free edition 2018-10-15 10:25:43 +02:00
Thulinma
937653bc0d LIVE_BANDWIDTH trigger readability improvement, triggers no longer block stderr. 2018-05-18 17:20:12 +02:00
Thulinma
a51f0d1039 Buffer fixup 2018-02-13 16:06:18 +01:00
Thulinma
87fb2fc5b9 Improved input descriptions 2018-02-13 13:05:35 +01:00
Thulinma
017c9dbb65 Improved input descriptions 2018-02-13 12:59:09 +01:00
Thulinma
a30f91f11c Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2017-11-28 11:23:42 +01:00
Thulinma
8f874d91d8 Fixed missing header in buffer 2017-11-28 11:23:20 +01:00
Thulinma
15801aa7b7 Track mapping and deletion fixes 2017-11-28 11:08:30 +01:00
Thulinma
2dd62e0dce Track mapping and deletion fixes 2017-11-28 10:54:52 +01:00
Thulinma
07a0a3df2d Moved STREAM_BUFFER EMPTY call from ~MistInBuffer() to finish() 2017-08-04 11:45:23 +02:00
Thulinma
6b1db9d0ec Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
2017-07-26 17:01:52 +02:00
Thulinma
3446d022e8 Added header read speed timers, simplified header logic for VoD. 2017-07-26 17:00:36 +02:00
Thulinma
fc5adc6ac0 LTS commit of OS edition Input edits 2017-07-22 18:58:17 +02:00
Thulinma
d42bf9777e Merge branch 'development' into LTS_development
# Conflicts:
#	CMakeLists.txt
#	src/input/input_buffer.cpp
2017-07-22 18:55:12 +02:00
Thulinma
45e4cddec9 Updated Input class with preRun() and checkArguments() instead of single setup() function 2017-07-22 18:53:05 +02:00
Thulinma
0e1a18986a Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
2017-06-23 15:06:59 +02:00
Thulinma
0907d6424f Fixed buffer status bug, fixed buffer firstms/lastms bug 2017-06-23 15:06:01 +02:00
Thulinma
0ca63d1440 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	src/input/input.cpp
2017-06-22 14:07:54 +02:00
Thulinma
25699ef8b2 Added stream status shared memory page (temporary system) 2017-06-22 14:03:35 +02:00
Thulinma
bef46f969c Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	lib/stream.h
#	src/input/input.cpp
#	src/output/output_http_internal.cpp
2017-06-09 20:34:57 +02:00
Thulinma
26f74accdf MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output. 2017-06-09 20:31:20 +02:00
Thulinma
2717c21d4e Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_mp4.cpp
2017-03-16 11:16:08 +01:00
Thulinma
43e82f8c87 Fix for Windows semaphore problem in live streams 2017-03-16 11:14:59 +01:00
Thulinma
cab87a6425 Updated triggers, implemented LIVE_BANDWIDTH trigger 2017-03-10 11:41:52 +01:00
Thulinma
7f6b919e4f Merge branch 'development' into LTS_development 2016-10-11 15:21:58 +02:00
Thulinma
c5870b02f1 Improved buffer behaviour for streams that are faster than real-time. Improved documentation for those areas as well. 2016-10-11 15:14:12 +02:00
Thulinma
748960bb44 Removed JSON dependency from FLV, sped up FLV input significantly, minor RTMP input speedup 2016-10-11 15:13:52 +02:00
Thulinma
b71765e6bc Buffer now reports JSON blob with stream details and possible issues, improved DRY/RECOVER behaviour 2016-10-11 15:13:20 +02:00
Thulinma
3ee83644f3 Added options to DTSC pull for controlling the buffer config. Made 8X target duration the default buffer size. Inputs now wait for INPUT_TIMEOUT *and* two biggestFragment durations, added a few helper functions to DTSC::Meta. Buffer now automatically sets segment size to min(configed_size, biggest_fragment/2) to prevent sudden reductions of fragment sizes by more than 50% 2016-10-11 15:04:52 +02:00
Thulinma
915a10207b Merge branch 'development' into LTS_development 2016-10-11 15:04:11 +02:00
Thulinma
22cd84fcd5 Added options to DTSC pull for controlling the buffer config. Made 8X target duration the default buffer size. Inputs now wait for INPUT_TIMEOUT *and* two biggestFragment durations, added a few helper functions to DTSC::Meta. Buffer now automatically sets segment size to min(configed_size, biggest_fragment/2) to prevent sudden reductions of fragment sizes by more than 50% 2016-10-11 15:02:29 +02:00
Thulinma
172bdabf36 New style of always-on inputs. Still needs interface updates 2016-09-22 09:51:21 +02:00
Thulinma
1172768c34 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/controller/controller_storage.h
#	src/output/output.cpp
2016-09-15 16:17:06 +02:00
Thulinma
a4f35ca11e Made sharedServer::finishEach explicit 2016-09-15 15:45:42 +02:00
Thulinma
7ca444edc2 Fixes lacking BUFFER_EMPTY trigger 2016-09-02 17:52:51 +02:00
Thulinma
2294fbd365 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_dtsc.cpp
#	src/output/output.cpp
2016-07-28 20:50:29 +02:00
Thulinma
2bdafc245d Fixed segmentation fault in buffer process for fast reconnects of sources 2016-07-28 20:45:39 +02:00
Thulinma
5076c89c6d Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
#	src/output/output.cpp
2016-07-23 13:13:28 +02:00
Thulinma
b7c3d7dc44 Various stability and verbosity tweaks for DTSC, RTMP and in general 2016-07-23 13:11:25 +02:00
Thulinma
fcc1dbd24f Tweaked buffer size for HLS some more 2016-06-28 00:13:34 +02:00
Thulinma
6ee52dad7e Tweaked buffer size for HLS some more 2016-06-27 13:21:54 +02:00