Commit graph

136 commits

Author SHA1 Message Date
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
Thulinma
76ebcd4735 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_ts_base.cpp
2015-08-04 11:35:20 +02:00
Thulinma
45e82e76eb Fixed HLS live playback on Apple devices, by resetting internal timestamps to zero for the beginning of all segments. 2015-08-04 11:34:51 +02:00
Thulinma
bf1e2c8083 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hss.cpp
2015-07-28 20:40:39 +02:00
Thulinma
b7b2bb5f68 Added CORS headers to HSS output, added HTTP OPTIONS support to HLS and HSS outputs. 2015-07-28 20:23:06 +02:00
Thulinma
e0c9173f9a Merge branch 'development' into LTS_development 2015-05-12 11:23:08 +02:00
Thulinma
a3bf393bea Added generic CORS header adder, now used in controller, HLS output and internal HTTP handler. 2015-05-12 11:23:00 +02:00
Thulinma
4bdbd82f66 LTS Commits 2015-04-05 21:38:36 +02:00
Thulinma
185d75e0d9 Fixed iPhone/iPad/iPod user agent detection. 2015-04-02 16:32:27 +02:00
Thulinma
92d5d9be51 Fixed audio-only HLS output 2015-03-14 14:02:46 +01:00
Thulinma
260a0ceb68 Fixed various HLS problems with LQ/short inputs 2015-03-06 11:19:49 +01:00
wouter spruit
ff049f4ea2 continuity improvements 2015-03-06 10:32:19 +01:00
Thulinma
95f19c4259 Merged TS unification edits by Wouter Spruit. 2015-03-05 13:49:09 +01:00
Thulinma
11cb5a640f Fixed HLS last segment missing. 2015-03-04 16:15:00 +01:00
wouter spruit
bac101b1e5 added sleep in output_http, fix for high CPU usage 2015-02-25 16:17:10 +01:00
Thulinma
9a0e009069 Fix merge mistake 2015-02-19 12:36:40 +01:00