Commit graph

3045 commits

Author SHA1 Message Date
Thulinma
6a0d2834c5 Merge branch 'development' into LTS_development 2016-07-29 09:48:49 +02:00
Thulinma
bd174d6db0 Fix seek-to-end issues with very near-live outputs 2016-07-29 09:48:43 +02:00
Thulinma
bd5c09b159 Fix DTSC output disconnect on new track issue. 2016-07-28 20:51:06 +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
5ffe12aba4 Tweaked several debug messages, backported a few Pro edition edits that were missed earlier 2016-07-28 20:45:31 +02:00
Thulinma
4dc3d22d12 Fixed potential deadlock in buffer when a past crash has happened 2016-07-28 20:44:28 +02:00
Thulinma
0232417512 Added method to count currently playing tracks in Output classes 2016-07-28 20:44:15 +02:00
Thulinma
a9388928c1 Merge branch 'development' into LTS_development 2016-07-26 13:57:51 +02:00
Thulinma
7afd3415b3 Fixed support for VoD assets with a > 8MiB header size 2016-07-26 13:57:43 +02:00
Thulinma
3a4784f1a9 Merge branch 'development' into LTS_development 2016-07-26 13:20:18 +02:00
Thulinma
6816b6074c Fixed support for non-HTTP-compliant devices pulling HTTP TS output 2016-07-26 13:20:13 +02:00
Thulinma
cf75a2d6a2 Merge branch 'development' into LTS_development 2016-07-25 13:24:47 +02:00
Thulinma
bfa9882e8c Added ISO639-2 decoding in JSON-formatted metadata output 2016-07-25 13:24:36 +02:00
Thulinma
16f293cf2c Merge branch 'development' into LTS_development 2016-07-23 22:55:41 +02:00
Thulinma
4cef8d7cf5 Small fixes for VoD and DTSC pull input 2016-07-23 22:55:35 +02:00
Thulinma
10c45dad2a Merge branch 'development' into LTS_development 2016-07-23 18:27:27 +02:00
Thulinma
6828a32db0 Tweak verbosity of wrong input order message. 2016-07-23 18:27:17 +02:00
Thulinma
b14b5f9bf5 Varioius stability and verbosity tweaks for DTSC, RTMP and in general 2016-07-23 13:13:34 +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
5f6abd291d Tweaks to output drop behaviour 2016-07-22 14:30:40 +02:00
Thulinma
55528a014a Added track drop message 2016-07-22 14:11:47 +02:00
Thulinma
cb5239ec01 Merge branch 'development' into LTS_development 2016-07-22 12:39:11 +02:00
Thulinma
4eb0a7c56c Fix RTMP buffering 2016-07-22 12:39:07 +02:00
Thulinma
ab95786984 Fix RTMP buffering 2016-07-22 12:38:54 +02:00
Thulinma
a3595879b0 Merge branch 'development' into LTS_development 2016-07-22 11:25:45 +02:00
Thulinma
dd612a2643 RTMP fixes for streams > 5h in duration. 2016-07-22 11:25:38 +02:00
Erik Zandvliet
7d4fd24866 Resolved play/pause issue with JWPlayer 2016-07-22 11:24:16 +02:00
Thulinma
51d96175fe RTMP fixes for streams > 5h in duration. 2016-07-22 11:23:53 +02:00
Erik Zandvliet
58ef8fcdd0 Resolved play/pause issue with JWPlayer 2016-07-22 11:01:56 +02:00
Erik Zandvliet
98438b680b Renegotiation of extra tracks if a new header is sent in dtsc pull 2016-07-21 17:44:12 +02:00
Thulinma
0c16ae5a80 Added track-reselection to DTSC output 2016-07-21 17:39:20 +02:00
Thulinma
09b398f36c Added list of viewers for all streams to balancer 2016-07-21 15:19:55 +02:00
Thulinma
f9dcbc7f13 Fixed balancer. 2016-07-21 14:46:29 +02:00
Thulinma
4e35165f3d Tweaked load balancer verbosity levels 2016-07-21 14:37:29 +02:00
Thulinma
4edeb9f63f Prevent FLV recordings from overwriting with empty files 2016-07-21 13:23:18 +02:00
Thulinma
13ff0e2904 Merge branch 'development' into LTS_development 2016-07-21 13:17:39 +02:00
Thulinma
d82f5e4b65 Minified. 2016-07-21 13:17:32 +02:00
Thulinma
d86899f6cc Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hls.cpp
#	src/output/output_rtmp.cpp
#	src/output/output_rtmp.h
2016-07-21 12:03:40 +02:00
Thulinma
70b66cd975 HLS segfault fix. 2016-07-21 11:59:17 +02:00
Thulinma
d7b1f05b51 Pro side of RTMP fixes 2016-07-21 11:50:24 +02:00
Thulinma
2f6cd40fb3 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_rtmp.h
2016-07-21 11:41:03 +02:00
cat
b7c37ba60d LSP/embed: fix for + in filenames in folder streams 2016-07-21 11:40:09 +02:00
Thulinma
e1fac6248e Fix RTMP not shutting down on playback. 2016-07-21 11:39:31 +02:00
Thulinma
6694fedb3c Merge branch 'development' into LTS_development 2016-07-21 10:15:34 +02:00
Thulinma
33a0b2fae3 Added URL encode for info_/embed_ stream URLs 2016-07-21 10:15:26 +02:00
Thulinma
1e3d4f6ee1 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_rtmp.cpp
2016-07-21 00:01:47 +02:00
Thulinma
ec7f7f5bc4 Correctly initialize isPushing value for RTMP 2016-07-20 23:59:54 +02:00
Thulinma
9ff8be341c Merge branch 'development' into LTS_development 2016-07-20 14:57:30 +02:00