Commit graph

121 commits

Author SHA1 Message Date
Thulinma
61b66e349e Added onCrash handler for inputs, buffer now does proper cleanup when crashing. 2016-04-22 09:30:32 +02: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
795db7d862 Made resume support disabled the new default. 2016-02-12 16:37:32 +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
Thulinma
53febd82d1 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2016-02-12 16:18:54 +01:00
Thulinma
2d78e1e5f1 Improved MistInBuffer CPU usage by 50%. 2016-02-12 15:46:23 +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
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
7168a3ffbd Added STREAM_BUFFER 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
4397b410d4 Fixed typo in buffer size calculation. 2015-11-27 09:53:23 +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
d504bbe720 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-10-20 15:36:33 +02:00
Thulinma
9df850a149 Fix for repushing. 2015-10-20 15:35:21 +02:00
Thulinma
279add438a Implemented triggers.
Merged from code by Wouter Spruit, with additions by yours truly.
2015-10-14 10:48:00 +02:00
Thulinma
24c17e9466 Tuned down debug verbosity for live streams significantly. 2015-09-26 22:41:15 +02:00
Thulinma
9903cd4322 Removed useless debug message. 2015-09-25 21:11:40 +02:00
Erik Zandvliet
1f4b523b1b Initial TS Input commit 2015-09-10 00:54:55 +02:00
Thulinma
b400ae20c0 Merge branch 'development' into LTS_development 2015-09-05 20:40:54 +02:00
Thulinma
c096450a8f Disallow < 1s buffer for live, set default from the start. 2015-09-05 20:40:44 +02:00
Thulinma
9b5bea2b15 Set default segment size from the start in buffer. 2015-09-05 20:40:07 +02:00
Thulinma
ccf1221d48 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-09-04 17:25:12 +02:00
Thulinma
0e55b66e7d Improved track removal timings. 2015-09-04 17:24:28 +02:00
Thulinma
bb7dcd8f2a Merge branch 'development' into LTS_development 2015-09-04 10:12:45 +02:00
Thulinma
2222a37079 Improvements to track negotiation timings and debug message verbosity. 2015-09-04 10:12:30 +02:00
Erik Zandvliet
0913d2607e Working PlayReady/Verimatrix DRM support 2015-09-02 12:09:37 +02:00
Erik Zandvliet
8024181e55 Made metadatapages larger 2015-06-26 18:05:42 +02:00
Erik Zandvliet
10d7d5fb62 Made metadatapages larger 2015-06-22 14:56:29 +02:00
Thulinma
9e10cc621c Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-05-21 20:17:37 +02:00
Thulinma
6b2a158d9c Backported various fixes by Erik Zandvliet, also added better handling of re-pushes. 2015-05-21 20:15:09 +02:00
Erik Zandvliet
926dd01995 Fixed removing pages at the right points. 2015-05-20 14:45:38 +02:00
Thulinma
6f933bdb97 Fixed live pushing when more than 2 tracks present. 2015-05-07 12:02:49 +02:00
Thulinma
77dcfc23ad Removed remaining recording code. 2015-04-28 09:39:01 +02:00
Thulinma
c96f0fb9e4 Merge branch 'development' into LTS_development 2015-04-21 17:14:51 +02:00
Thulinma
acc462c281 Minor edit to live buffer semaphore naming. 2015-04-21 17:14:13 +02:00
Thulinma
9b683f6ee3 Merge branch 'development' into LTS_development 2015-04-15 13:49:18 +02:00
Thulinma
73b1f2d75c Prevented deleting live tracks too soon. 2015-04-15 13:49:12 +02:00
Thulinma
818ffbed33 Merge branch 'development' into LTS_development 2015-04-14 17:33:35 +02:00
Thulinma
f86476153e Fixed live semaphore problems. 2015-04-14 17:33:30 +02:00
Thulinma
3489d1ee34 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-04-14 15:32:05 +02:00
Thulinma
69cf17d01d Increased maximum simultaneous tracks from 5 to 10, made this a define option. Allow multiple pushes through a single RTMP connection. 2015-04-14 15:30:25 +02:00
Thulinma
4bdbd82f66 LTS Commits 2015-04-05 21:38:36 +02:00
Erik Zandvliet
d370ef4eac Working multi-input 2015-04-02 09:56:47 +02:00
Thulinma
cf52b6bbcc Added support for space as a stream separator character. 2015-03-13 01:05:01 +01:00