Commit graph

125 commits

Author SHA1 Message Date
Thulinma
7beea43d31 Added basic stream fallback feature, allowing to redirect to a different stream name on stream source load errors 2020-01-23 13:43:31 +01:00
Thulinma
b86ea9adc8 Removed old HLS code 2019-04-26 17:08:35 +02:00
Thulinma
b8415d09c6 HLS/DASH stream track selector support in index URLs, fixed source matching when multi-select or type-select is used, handle user agent exceptions in Output::selectDefaultTracks(), added Util::codecString to stream.h library, removed duplicate/wrong code from DASH/HLS outputs 2019-04-26 13:50:39 +02:00
Thulinma
51a65209fa Merge branch 'development' into LTS_development 2019-04-26 11:06:33 +02:00
Thulinma
09d4bb6318 Added improved HLS output error handling 2019-04-19 14:14:17 +02:00
Thulinma
01d43796ad 32-bit fixes 2019-01-26 00:51:30 +01:00
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
Thulinma
3977bad570 Merge sessions option in HLS output now supports caching properly 2019-01-14 16:53:05 +01:00
Thulinma
2861102483 Merge branch 'development' into LTS_development 2018-12-13 13:19:38 +01:00
Thulinma
081f91653e Updated capa for outputs 2018-12-13 13:18:12 +01:00
Thulinma
109995809d Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http_internal.cpp
2018-11-13 16:35:12 +01:00
Thulinma
251dc5f171 Better onFail handling, better HTTP failure handling 2018-11-13 16:34:30 +01:00
Thulinma
b2995ea2db Fix statistics in Free edition 2018-10-15 13:43:51 +02:00
Thulinma
a7f6788d80 Blacklisted HEVC for non-Apple devices 2018-08-13 15:48:35 +02:00
Thulinma
3b16f03674 Added HLS protocol option to disable session IDs, merging together all views from a single user into a single session. 2018-05-18 17:20:55 +02:00
Thulinma
7f1fca24d7 Added non-chunked options to DASH and HLS outputs 2018-05-17 21:45:14 +02:00
Thulinma
ebb9b3d8c4 Fix for HLS streams with "m3u" in the stream name 2018-05-09 12:24:02 +02:00
Thulinma
54e26f3ef4 Fixed HEVC codec display in HLS output 2018-04-30 17:06:38 +02:00
Thulinma
9d93d78b8b Add codec/resolution/framerate information to HLS index
# Conflicts:
#	src/output/output_hls.cpp
#	src/output/output_hls.h
2018-04-23 11:07:26 +02:00
Thulinma
807324f133 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hls.cpp
#	src/output/output_hls.h
2018-04-23 11:04:49 +02:00
Thulinma
06bda0240c Add codec/resolution/framerate information to HLS index 2018-04-23 10:56:40 +02:00
Thulinma
266ab3a654 Implemented browser detection and handling of output-specific browser exceptions. 2018-03-27 15:58:51 +02:00
Thulinma
f65c759292 Implemented browser detection and handling of output-specific browser exceptions. 2018-03-27 15:57:08 +02:00
Thulinma
2dbdd855cd Changed HLS playlist content type 2018-02-14 09:09:54 +01:00
Thulinma
f4f644ee34 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hls.cpp
2017-12-11 13:14:44 +01:00
Thulinma
b3cdf34fbc Respond more correctly to failed HLS requests 2017-12-11 13:13:38 +01:00
Thulinma
71477f05d3 Fixed HLS non-subtitle output 2017-11-30 14:10:58 +01:00
Ramoe
e09cd5308e Added SRT input, MP4 output subtitle support, DASH and HLS output subtitle support 2017-11-23 14:14:58 +01:00
Ramoe
b9e261e1ef Reworked existing subtitle support (sideloaded, MP4 in and srt out) 2017-11-23 14:14:52 +01:00
Thulinma
3cb5774822 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.h
#	src/output/output_hls.cpp
2017-10-20 14:25:27 +02:00
Erik Zandvliet
c1373fba17 Fixes hls crash on non-existing streams 2017-10-20 14:23:32 +02:00
Thulinma
f5553f49f9 Fixed MPEG2/MP2 support in HLS 2017-07-28 18:40:33 +02:00
Thulinma
c0515579a0 Fixed HLS push output HEVC support 2017-07-28 18:40:06 +02:00
Thulinma
9ddfa97148 Added automatic User-Agent stream tagging 2017-04-18 12:33:54 +02:00
Thulinma
aebeeabd2b Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_httpts.cpp
#	src/output/output_ts_base.h
2016-12-28 16:32:16 +01:00
Thulinma
1a4c62e763 TS base class can now repeat headers every X millis instead of at hardcoded interval 2016-12-28 14:59:23 +01:00
Thulinma
f0fa0e206b Implemented SDT table and several extra descriptors 2016-12-28 14:59:23 +01:00
Thulinma
046d89d50c Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.cpp
2016-11-22 10:15:30 +01:00
Thulinma
405195a979 Fixed Connection: close header parsing in HLS 2016-11-22 09:56:50 +01:00
Thulinma
3f14db4b12 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
#	src/output/output.cpp
2016-11-14 11:29:24 +01:00
Thulinma
653f5cf085 Removed TS-level discontinuities from HLS 2016-11-14 10:52:41 +01:00
Thulinma
f69fe8a4fb Moved HLS-specific TS output handling from output_ts_base to output_hls 2016-11-14 10:52:35 +01:00
Thulinma
59ae4f5aca Merge branch 'development' into LTS_development 2016-10-11 16:41:15 +02:00
Thulinma
15def0eaec Significant speed boost to all TS-based outputs 2016-10-11 16:38:56 +02:00
Thulinma
d457864bf1 Various improvements and simplifications to HLS
# Conflicts:
#	src/output/output_hls.cpp
2016-10-11 16:17:57 +02:00
Thulinma
a79f0fc988 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hls.cpp
2016-10-11 16:16:40 +02:00
Thulinma
54d927c9df Various improvements and simplifications to HLS 2016-10-11 16:14:27 +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