Commit graph

3069 commits

Author SHA1 Message Date
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
Thulinma
a9dffb9438 Added check for invalid handle to config storage 2016-07-20 14:56:04 +02:00
Thulinma
b608f011e3 Load balancer fixes/improvements made during paper writing. 2016-07-20 11:07:46 +02:00
Thulinma
8219ac15ca Merge branch 'development' into LTS_development 2016-07-19 14:20:45 +02:00
Thulinma
7c60f31c09 Added CORS headers to SRT and MP4 outputs 2016-07-19 14:19:01 +02:00
Thulinma
e0cc16cd86 Merge branch 'development' into LTS_development 2016-07-19 12:05:12 +02:00
Thulinma
d5fee4d656 Even more JSON/VTT/SRT fixes and internal URL handler improvements 2016-07-19 12:05:05 +02:00
Thulinma
49764e99fd Merge branch 'development' into LTS_development 2016-07-19 10:27:49 +02:00
Thulinma
56dd4ac98c More fixes to srt and vtt outputs 2016-07-19 10:27:29 +02:00
Thulinma
64746da63c Merge branch 'development' into LTS_development 2016-07-19 10:05:04 +02:00
Thulinma
c78e695bad Various small fixes to SRT and JSON outputs 2016-07-19 10:04:56 +02:00
Thulinma
f83a5525f4 MP4 language support in input, Timed Text input support (rudimentary, without styles) 2016-07-18 10:44:29 +02:00
Thulinma
d0abad68b3 Added track language support to TS input 2016-07-18 10:44:29 +02:00
Thulinma
523c00f462 TS input can now cope a bit better with packet loss, incomplete UDP packets now buffered 2016-07-18 10:44:29 +02:00
Thulinma
4bcfb5191a Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_mp4.cpp
2016-07-18 10:43:38 +02:00
Thulinma
1187b60454 Rudimentary support for SRT output with TTXT codec 2016-07-18 10:38:41 +02:00
Thulinma
0a2a749566 Language support for MP4 2016-07-18 10:38:26 +02:00
Thulinma
3844dac4fd Added track language support to TS and DTSC internals 2016-07-18 10:20:29 +02:00
Thulinma
a73f97e065 Implemented ES priority flag in accordance with HBBTV spec 2016-07-18 10:20:21 +02:00
Thulinma
a68caa68cb Removed nolive flag for DASH output 2016-07-11 13:34:56 +02:00
Thulinma
d21c15fcdd Fixed parsing of ADTS inside TS spread over multiple PES 2016-07-07 22:31:35 +02:00
Thulinma
bd38fd20c3 More TS-related improvements, to ADTS support specifically. 2016-07-07 22:31:35 +02:00
Erik Zandvliet
f7473bd26a Mark as keyframe if nal_type is 1, and slice_type is 2,4,7 or 9. 2016-07-07 22:31:35 +02:00
Erik Zandvliet
f7b7f54584 Skip over the h264 scaling list when it is present. 2016-07-07 22:31:35 +02:00
Thulinma
bd6ad88f76 Merge branch 'development' into LTS_development 2016-07-07 22:31:23 +02:00
Thulinma
c78cbc22ea Fixed real-time playback of VoD streams that do not start at a zero timestamp 2016-07-07 22:31:11 +02:00
Thulinma
636e2b3a0a Backported from OS version edits. 2016-07-06 16:20:11 +02:00