Commit graph

1360 commits

Author SHA1 Message Date
Thulinma
77a6315dfb Wipe sessions when they expire. 2016-02-29 13:16:58 +01:00
Balder
7710a7d8a7 BalderDash fixes (H264 mp4 codecs weirdness//FF) 2016-02-29 11:35:17 +01:00
Balder
b79fb8cd6b MP4 header read optimise by Erik 2016-02-26 10:23:45 +01:00
Thulinma
f6e2e95b5a Added USER_NEW trigger. 2016-02-19 11:33:40 +01:00
Thulinma
4db2ea97ed HLS now won't remove fragments if <= 3 available 2016-02-19 11:32:41 +01:00
Thulinma
bbf0417b36 Disable resume support for live buffers by default. 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
Thulinma
463e549b4d Fixed naming bug when adding new streams 2016-02-16 09:18:02 +01:00
Thulinma
795db7d862 Made resume support disabled the new default. 2016-02-12 16:37:32 +01:00
Thulinma
bee6ba11e6 Fixed RTSP. 2016-02-12 16:33:01 +01:00
Thulinma
62f3a9f4d2 Fixed high CPU usage of TS input during shutdown. 2016-02-12 16:30:34 +01:00
Erik Zandvliet
c25a533729 Recording, HLS Push, UDP (Multicast) Input, Threaded TS 2016-02-12 16:30:33 +01:00
ozzay
1c3e143709 Recording functionality by Diederick Huijbers, slightly tweaked. 2016-02-12 16:29:08 +01:00
Erik Zandvliet
c0b5f0d4b1 X-Real-IP support 2016-02-12 16:29:08 +01:00
Thulinma
53febd82d1 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2016-02-12 16:18:54 +01:00
Thulinma
d56e7f1408 Added a proxy in Output for getting the host (by Erik Zandvliet) 2016-02-12 15:51:54 +01:00
Thulinma
2d78e1e5f1 Improved MistInBuffer CPU usage by 50%. 2016-02-12 15:46:23 +01:00
Erik Zandvliet
1866e4e1e1 Updated CORS headers and the (HTTP) output protocols to work with it. 2016-01-26 14:34:14 +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
Erik Zandvliet
90a53ddf70 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hds.cpp
2016-01-26 14:15:17 +01:00
Erik Zandvliet
3c48a6c03c Embedding of flash players 2016-01-26 14:14:12 +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
Erik Zandvliet
e90c3193d6 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
#	src/input/input_buffer.h
2015-12-17 19:25:16 +01:00
Erik Zandvliet
a604d616f7 'Ugly' fix for dissapearing metadata 2015-12-17 19:22:55 +01:00
Thulinma
ed5440e382 Added ability to disable resume support for live streams. 2015-11-27 14:51:15 +01:00
Thulinma
bf180a2a35 Added "minimal" API request for requesting minimal responses only. 2015-11-27 10:44:21 +01:00
Thulinma
22467d603e Added support for clients and lastms requests in active_streams API call 2015-11-27 10:44:21 +01:00
Thulinma
7168a3ffbd Added STREAM_BUFFER trigger. 2015-11-27 10:44:21 +01:00
Thulinma
233b31ddee Added RTMP_PUSH_REWRITE trigger. 2015-11-27 10:44:21 +01:00
Thulinma
9e1f0fcb7d Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-11-27 10:44:09 +01:00
Thulinma
c9ddc3fe1a Fixed level of waiting for track debug message. 2015-11-27 10:01:24 +01:00
Thulinma
4397b410d4 Fixed typo in buffer size calculation. 2015-11-27 09:53:23 +01:00
Thulinma
d887e01aed Merge branch 'development' into LTS_development 2015-11-24 15:20:40 +01:00
cat
2919e74d4e forward script params to video url 2015-11-24 12:52:41 +01:00
cat
63f9fb52a5 LSP / embed support for appending a string to the video url 2015-11-20 12:11:00 +01:00
Balder
689129e805 Merge branch 'development' into LTS_development 2015-11-19 14:04:22 +01:00
Balder
d8bfe8cebc Fixed ability to disable video or audio tracks from HTTP output. 2015-11-19 14:02:21 +01:00
Balder
7d9d4e26ae fixed LTS tag for request url 2015-11-19 13:53:22 +01:00
Thulinma
c51f1b4955 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-11-16 16:16:44 +01:00
Thulinma
f268988354 Fixed buffer incorrectly nulling indexes for live streams. 2015-11-16 16:15:52 +01:00
Thulinma
2bc333956a Merge branch 'development' into LTS_development 2015-11-16 11:44:19 +01:00
Thulinma
c194396215 Clarified valid page numbers debug message. 2015-11-16 11:44:11 +01:00
Thulinma
bd836f247d Merge branch 'development' into LTS_development 2015-11-12 11:11:40 +01:00
Thulinma
e20761e8c7 Fix the case when a keyframe is not the first data pushed. 2015-11-12 11:11:32 +01:00
Thulinma
4db86ab2bb Fixed HTTP-based CONN_PLAY triggers URLs 2015-11-12 10:13:16 +01:00
Thulinma
35b2dd6bee Better working TS input, Pro side. Code by Erik Zandvliet. 2015-11-05 17:11:04 +01:00