Commit graph

151 commits

Author SHA1 Message Date
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
Thulinma
6c466d452a Removed deprecated startpos option. 2016-06-27 13:17:15 +02:00
Thulinma
02ac648bae Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hls.cpp
2016-06-26 21:16:06 +02:00
Thulinma
9e391915df HLS-related buffer size optimizes 2016-06-26 21:14:23 +02:00
Thulinma
42e0b4b8ef Pro side of HLS buffer size optimizes. 2016-06-26 21:12:25 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
3bbda96ca0 More debug level tweaks at production level. 2016-05-25 13:16:19 +02:00
Erik Zandvliet
72de5e5b90 Changed sleep to wait everywhere where it was needed 2016-05-18 17:06:23 +02:00
Thulinma
edb1d5ca67 Added generic session ID overrider. 2016-05-18 13:24:23 +02:00
Erik Zandvliet
a5a9facc22 DTSC Pull optimizes and quick-negotiate. 2016-05-13 17:27:25 +02:00
Erik Zandvliet
dda0ea669c Fully implemented DTSC pull support 2016-05-05 16:05:12 +02:00
Thulinma
dbe2b1f661 HLS now sends unique session IDs for splitting sessions from each other. 2016-04-22 16:17:28 +02:00
Thulinma
4db2ea97ed HLS now won't remove fragments if <= 3 available 2016-02-19 11:32:41 +01:00
Thulinma
a6ef31d1ea Changed buffer full/empty behaviour to trigger at 3 segments instead of 50% of buffer size. 2016-02-19 11:32:41 +01:00
Thulinma
b6f03a4591 Undo undone stuff. Bad Erik! 2016-02-18 13:33:34 +01:00
Erik Zandvliet
c25a533729 Recording, HLS Push, UDP (Multicast) Input, Threaded TS 2016-02-12 16:30:33 +01:00
Erik Zandvliet
3f93ca5f82 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_mp4.cpp
2016-01-26 14:33:23 +01:00
Erik Zandvliet
a39350f83e CORS Headers 2016-01-26 14:31:09 +01:00
Thulinma
8eb518606a Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-12-25 15:44:23 +01:00
Thulinma
78d69673f3 Fix HLS start issues for live streams. 2015-12-25 14:47:20 +01:00
Thulinma
401fe65979 - Made HLS no longer skip first fragment.
- Ignore metadata tracks and invalid tracks for buffer calculations.
- Fixed statistics.
2015-12-25 14:37:32 +01:00
Thulinma
e3f324e9af Merge branch 'development' into LTS_development 2015-10-14 11:19:08 +02:00
Thulinma
b28b463662 Improved HLS bandwidth accuracy. 2015-10-14 11:18:56 +02:00
Thulinma
d8051984f2 Merge branch 'development' into LTS_development 2015-09-03 17:55:47 +02:00
Thulinma
096b289cdf Updated --version argument to give more detailed output. 2015-09-03 17:54:20 +02:00