Commit graph

3061 commits

Author SHA1 Message Date
Thulinma
7483bd9fd4 Tweaked seek/isReadyForPlay implementations, fix HLS support for large key durations. 2016-06-08 00:01:24 +02:00
Thulinma
e6ff699ad8 Added proper buffering of not-yet-accepted tracks. 2016-06-07 23:24:52 +02:00
Thulinma
3c41142a57 RTMP track re-selection timer added. 2016-06-07 15:25:36 +02:00
Thulinma
7c46f008a8 Simplified and fortified MP4 live code. 2016-06-07 15:25:36 +02:00
Thulinma
fecfc20052 Improved output default seek position and completeKeyReady logic 2016-06-07 15:24:11 +02:00
Thulinma
6c723f6ca0 Merge branch 'development' into LTS_development 2016-06-06 16:31:12 +02:00
Thulinma
425aa3059f Optimized waiting for streams/tracks. 2016-06-06 16:31:06 +02:00
Thulinma
1818aca35b Fixed RTMP push failing if wait time too long. 2016-06-06 16:30:52 +02:00
Thulinma
fcd11f44c4 Optimized waiting for streams/tracks. 2016-06-06 16:30:30 +02:00
Thulinma
326061ca18 Merge branch 'development' into LTS_development 2016-06-06 12:19:01 +02:00
Thulinma
cc93a8fa4e Socket internal data counters now 64 bits unsigned integers 2016-06-06 12:18:48 +02:00
Thulinma
6fec8fae70 Improved MP4 delay, made MP4 live slightly more readable. 2016-06-06 01:10:10 +02:00
Thulinma
b3bce527f8 Now nulling thisPacket on output reconnect(). 2016-06-06 01:09:16 +02:00
Thulinma
8edc642884 Fixed a typo. 2016-06-04 21:04:48 +02:00
Thulinma
e7962fce26 Fixed IPv6 addresses in hostnames in info_ json_ and embed_ URLs as well as .smil URLs. 2016-06-03 11:00:38 +02:00
Thulinma
9ecce58e3c Merge branch 'development' into LTS_development
# Conflicts:
#	CMakeLists.txt
#	lib/dtsc.h
#	lib/dtscmeta.cpp
#	lib/mp4_generic.cpp
#	lib/mp4_ms.cpp
#	lib/procs.cpp
#	lib/socket.cpp
#	lib/stream.cpp
#	lib/stream.h
#	lib/ts_packet.cpp
#	src/analysers/dtsc_analyser.cpp
#	src/controller/controller.cpp
#	src/controller/controller_capabilities.cpp
#	src/controller/controller_statistics.cpp
#	src/controller/controller_storage.cpp
#	src/controller/controller_storage.h
#	src/controller/controller_streams.cpp
#	src/input/input.cpp
#	src/input/input.h
#	src/input/input_buffer.cpp
#	src/input/input_buffer.h
#	src/input/input_dtsc.cpp
#	src/io.cpp
#	src/io.h
#	src/output/mist_out.cpp
#	src/output/output.cpp
#	src/output/output_hls.cpp
#	src/output/output_hls.h
#	src/output/output_hss.h
#	src/output/output_http_internal.cpp
#	src/output/output_httpts.h
#	src/output/output_progressive_flv.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_raw.cpp
#	src/output/output_rtmp.cpp
#	src/output/output_rtmp.h
#	src/output/output_ts.cpp
2016-06-02 14:50:22 +02:00
Thulinma
d8f57afae1 Fixed push trigger naming in LSP 2016-06-02 14:07:21 +02:00
Thulinma
3638d8405d Now nulling thisPacket on output reconnect(). 2016-06-02 14:07:21 +02:00
Thulinma
837b2b5d4f Added resume support and quick negotiation support from Pro, as well as support for stream-type inputs. 2016-06-02 14:07:21 +02:00
cat
d4e2654f24 LSP remove graph coords option 2016-06-02 14:07:21 +02:00
cat
56e9b79d68 LSP: IPv6 compat fix, autoplay default on, push page LTSified 2016-06-02 14:07:21 +02:00
Thulinma
0b2355c5bb Fixed IPv6 addresses in hostnames in info_ json_ and embed_ URLs as well as .smil URLs. 2016-06-02 14:07:21 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
7398a88f2f Removed some dead old Pro code. 2016-05-31 20:21:21 +02:00
Thulinma
d048aaccc4 Forwardported some free version changes to Pro. 2016-05-30 16:03:52 +02:00
Thulinma
29f40890e7 Merge branch 'development' into LTS_development 2016-05-29 09:56:07 +02:00
Thulinma
ef9938da0c Actually really made the default install prefix /usr 2016-05-29 09:36:15 +02:00
Thulinma
877f0d70d5 Merge branch 'development' into LTS_development 2016-05-28 20:28:25 +02:00
Thulinma
f252c44fe8 Updated systemd script. 2016-05-28 20:27:32 +02:00
Thulinma
a836bc560b Merge branch 'development' into LTS_development 2016-05-28 18:58:08 +02:00
Thulinma
17aea79d57 Made standard install prefix /usr 2016-05-28 18:58:03 +02:00
Thulinma
1d950f31ba Fix controller deadlock. 2016-05-28 13:45:19 +02:00
Thulinma
f010dcd0f7 Fix controller segfault on using fillActive function during stats update. 2016-05-27 21:08:39 +02:00
Thulinma
324d29fb0c Better track time mismatch message. 2016-05-27 15:40:11 +02:00
Thulinma
58c3475ca9 Allow (re)selecting newly (re)appeared tracks in RTMP output. 2016-05-27 15:02:39 +02:00
Thulinma
0d5719f76c Improved generic prepareNext() and stats() handling 2016-05-27 14:02:37 +02:00
Thulinma
5ad6679783 Optimized live packet wait loop 2016-05-26 23:36:26 +02:00
Thulinma
52d0c66166 Prevent re-initialized connections from counting bytes too eagerly. 2016-05-26 18:24:25 +02:00
Thulinma
8b87337314 Added debug message for connections switching away from an existing active session. 2016-05-26 18:16:50 +02:00
Thulinma
e95aa4f3b6 Only drop 5s inactive tracks if they have been replaced by a track of the same type that is active. 2016-05-26 12:58:48 +02:00
Thulinma
9e245c2b51 Fix stopping behaviour for outgoing pushes when streams end. 2016-05-26 12:48:52 +02:00
Thulinma
4dffb10eb9 Fixed horrible, horrible, horrible RTMP timestamp bug. 2016-05-25 16:40:21 +02:00
Thulinma
1f319cc782 shm_open failures are now on HIGH level in stead of FAIL level. 2016-05-25 16:40:08 +02:00
Thulinma
4aa4335354 Instead of reloading only TRID, reconnect to entire stream when waiting for 2+ seconds. 2016-05-25 16:39:46 +02:00
Thulinma
070b4d7866 RTMP push output fixes, RTMP input read fixes. 2016-05-25 14:36:44 +02:00
Thulinma
e65c43defc Made RTMP push output not work in real-time mode, but fast-as-possible mode. 2016-05-25 13:16:19 +02:00
Thulinma
3bbda96ca0 More debug level tweaks at production level. 2016-05-25 13:16:19 +02:00
Thulinma
3c5f612709 Made wrong packet order message much less spammy. 2016-05-25 13:16:19 +02:00
Thulinma
d05ae8fa23 More debug output for handling timed out tracks, including possible workaround and/or fix. 2016-05-25 13:16:19 +02:00
Erik Zandvliet
ef884845e0 Working TS Input on current LTS 2016-05-25 13:15:23 +02:00