Commit graph

606 commits

Author SHA1 Message Date
Thulinma
dc8bae8dd3 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.h
2017-07-28 18:39:49 +02:00
Erik Zandvliet
c895a6b7e2 Added codec to "Done buffering" message 2017-07-28 18:39:09 +02:00
Thulinma
20b3010e75 Added http://*.ts and http-ts://* URL support to TS input, siginificant TS parsing/input speed upgrades, various other related fixes and sundry 2017-07-27 18:59:23 +02:00
Thulinma
8f4ddf14d9 Added header read speed timers, simplified header logic for VoD. 2017-07-26 17:02:03 +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
Ramkoemar
0f92664bb4 bugfixes hls input 2017-07-25 15:57:15 +02:00
Thulinma
f3cc7b0a4e Merge branch 'development' into LTS_development 2017-07-25 15:57:01 +02:00
Ramkoemar
96c451463b updated h264 input for new dtsc edits 2017-07-25 15:56:51 +02:00
Thulinma
9fbd0b6112 Added ts-exec: input support 2017-07-22 18:58:17 +02:00
Thulinma
fc5adc6ac0 LTS commit of OS edition Input edits 2017-07-22 18:58:17 +02:00
Thulinma
9405c8931c TS input now correctly obeys always-on setting. 2017-07-22 18:57:36 +02:00
Thulinma
7bbec5323e HLS input can now be set to always on 2017-07-22 18:57:36 +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
72a6816ec1 Added DTSC stdin input 2017-07-22 18:50:16 +02:00
Thulinma
a0d54e1a95 Added H264 Annex B stream input 2017-07-22 18:49:57 +02:00
Erik Zandvliet
a2b83e0cd3 Merge branch 'development' into LTS_development 2017-07-19 17:43:27 +02:00
Thulinma
9cc2f75a8e Added load balancer input 2017-07-05 13:47:21 +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
290d01a47f Merge branch 'development' into LTS_development 2017-06-19 20:37:45 +02:00
Erik Zandvliet
4de8932fe0 Fix in mp3 seeking code to correctly set the timestamp. 2017-06-19 20:37:25 +02:00
Thulinma
de4fea643a Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_flv.cpp
#	src/output/output_rtmp.cpp
2017-06-19 12:46:41 +02:00
Thulinma
cef78b7d08 PCM support in Flash-based protocols 2017-06-19 12:40:32 +02:00
Thulinma
1a0548ec68 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
#	src/input/input.h
2017-06-09 20:41:48 +02:00
Thulinma
920efe0b26 Updated serve-type inputs to obey "always on" stream config setting, push inputs no longer counted as viewers. 2017-06-09 20:40:03 +02:00
Thulinma
26f4d1fdee 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:35:06 +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
6bca77d758 Merge branch 'development' into LTS_development 2017-05-23 21:36:55 +02:00
Thulinma
24a1744b7e Input now prints message and aborts cleanly when pull lock could not be opened. 2017-05-23 21:36:49 +02:00
Thulinma
fac86bce49 Updated MistInAV in line with recent libavformat deprecations 2017-05-16 14:52:33 +02:00
Thulinma
3a4f990143 Removed useless variables in input class 2017-05-15 12:26:38 +02:00
Thulinma
5ed7c7ab22 Fixed TS input 2017-05-15 12:26:27 +02:00
Thulinma
51209e816c Removed useless variables in input class 2017-05-15 12:26:17 +02:00
Thulinma
2ba1dac4cd TS UDP input error message fix + stop if buffer shuts down fix 2017-05-15 11:15:11 +02:00
Thulinma
3cba6f011f Merge branch 'development' into LTS_development 2017-05-13 23:43:06 +02:00
Thulinma
41842227fa Added support for Opus in Ogg input 2017-05-13 23:42:32 +02:00
Thulinma
a178fd206d MistInAV X3 speedup + fixed VoD/live flag 2017-05-13 22:13:52 +02:00
Thulinma
401c323564 Fixed HLS input VoD 2017-05-12 15:39:21 +02:00
Thulinma
56c21b5ba6 Style enforcement 2017-05-12 12:56:37 +02:00
Balder
6811b54186 le fixes by me, all me none of it was Erik 2017-05-12 12:56:37 +02:00
Erik Zandvliet
2db54b38fc HLS input cleanup/restructure 2017-05-12 12:56:37 +02:00
Ramoe
a9c5334833 Added HLS input 2017-05-12 12:56:37 +02:00
Ramoe
30beda61ce Changed input boot sequence to allow for finer control 2017-05-12 12:56:37 +02:00
Thulinma
0c87ba1f7b Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
2017-05-12 12:48:58 +02:00
Thulinma
260894468e Changed input boot sequence to allow for finer control 2017-05-12 12:47:15 +02:00