Commit graph

2550 commits

Author SHA1 Message Date
Thulinma
b8eec40fbf Fixed documentation for realTime variable, improved output verbosity when waiting for inputs to load up pages, made timer more precise. 2015-07-11 01:07:06 +02:00
Thulinma
ec78f92b8e Allow setting of play back rate multiplier in MP4 output through the "rate" GET parameter. 2015-07-11 01:05:18 +02:00
Thulinma
0fdf39db8c Fixed Pro compile flags to actually work. Imagine that! 2015-07-09 09:18:08 +02:00
Thulinma
b316878674 Merge branch 'development' into LTS_development 2015-07-08 22:38:36 +02:00
Thulinma
421842bda5 Fixed incorrect stripping of ? character and beyond in stream name containing a + or space character before the ? character. 2015-07-08 22:38:27 +02:00
Thulinma
a9971f07cf Merge branch 'development' into LTS_development 2015-07-01 16:59:33 +02:00
Thulinma
b93841f659 Fixed NOSHM and WITH_THREADNAMES flags, added NOCRASHCHECK flag. 2015-07-01 16:59:26 +02:00
Thulinma
8f37536403 Merge branch 'development' into LTS_development 2015-06-30 17:01:10 +02:00
Thulinma
f463606152 Fixed metadata sizing problems. 2015-06-30 17:00:52 +02:00
Erik Zandvliet
06cfc1eed2 Fixes for HTTP DASH live streaming 2015-06-30 16:00:29 +02:00
Thulinma
e1313e3bb5 Merge branch 'development' into LTS_development 2015-06-26 18:05:57 +02:00
Erik Zandvliet
1b724afc83 Small fix in playback speed, when resuming playback 2015-06-26 18:05:51 +02:00
Erik Zandvliet
8024181e55 Made metadatapages larger 2015-06-26 18:05:42 +02:00
Thulinma
97fb7a6188 Merge branch 'development' into LTS_development 2015-06-26 18:04:21 +02:00
Thulinma
9577f99ce0 Added various VERYHIGH level debug messages to buffering, fixed streams with no more than 1 keyframe in each track not working. 2015-06-26 18:04:05 +02:00
Erik Zandvliet
3920ce38b5 Small fix in playback speed, when resuming playback 2015-06-23 11:12:42 +02:00
Erik Zandvliet
10d7d5fb62 Made metadatapages larger 2015-06-22 14:56:29 +02:00
Thulinma
cd74fd1e46 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller.cpp
2015-06-18 16:07:30 +02:00
Thulinma
eaabf9e800 Fixed errors when requesting short URLs, fixed race condition during shutdown of controller. 2015-06-18 16:06:35 +02:00
Thulinma
1391a23c9e Merge branch 'development' into LTS_development 2015-06-16 13:31:37 +02:00
Thulinma
a3354aeee6 Removed metadata parsing from controller for better stability and faster stream handling.
# Conflicts:
#	src/controller/controller_streams.cpp
2015-06-16 13:18:16 +02:00
Thulinma
ab222cb766 Merge branch 'development' into LTS_development 2015-06-16 12:33:53 +02:00
Erik Zandvliet
ef29ce2ca6 Fixed a race condition in VoD, where the page was declared "ready" before it was filled. 2015-06-16 12:32:18 +02:00
Thulinma
036178f780 Removed metadata parsing from controller for better stability and faster stream handling. 2015-06-16 11:18:00 +02:00
Thulinma
c04572f685 Removed logs from controller config file. 2015-06-16 11:17:39 +02:00
Thulinma
9c4af587df Fix stats analyser. 2015-06-16 11:17:18 +02:00
Thulinma
a936d1c737 Merge branch 'development' into LTS_development 2015-06-12 23:58:35 +02:00
Thulinma
0789cc46d2 Implemented RTMP calls ping and FCSubscribe, fixed a few RTMP typoes, added error handler for unsupported commands. 2015-06-12 23:58:23 +02:00
Thulinma
e17b9cb7bc Merge branch 'development' into LTS_development 2015-06-03 17:24:55 +02:00
Thulinma
48f8bbcb91 Added support for HTTP prefixes without $ symbol. 2015-06-03 17:24:43 +02:00
Thulinma
2d37739c30 Added basic minimal HTTP server output. 2015-06-03 16:39:16 +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
Thulinma
993801789a Merge branch 'development' into LTS_development 2015-05-21 19:16:22 +02:00
Thulinma
17aa6bbbb6 Compatibility improvements as well as simplification to RTMP push input. 2015-05-21 19:10:05 +02:00
Erik Zandvliet
926dd01995 Fixed removing pages at the right points. 2015-05-20 14:45:38 +02:00
Thulinma
049e9babe0 Merge branch 'development' into LTS_development 2015-05-19 14:21:02 +02:00
Thulinma
7e2c4a8318 Fixed track misnegotiation in live pushing. 2015-05-19 14:20:45 +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
5326c07731 Changed DASH CORS headers to generic header adder. 2015-05-12 11:20:41 +02:00
Thulinma
a97797a604 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-05-11 19:18:20 +02:00
Thulinma
2845cbedcb More fixes to Windows live metadata handling. 2015-05-11 19:11:00 +02:00
Thulinma
657d7ad7ca Fixed MP4 playback problems with zero-length parts (Mantrics playback issue). 2015-05-11 19:02:00 +02:00
Thulinma
ccaec3d2f8 Fixed live stream memory leak in Windows builds 2015-05-07 19:00:01 +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
ac540cdd1d LTS feature: Added support for setting/overriding the error text for failed streams. 2015-04-17 02:01:27 +02:00