Commit graph

931 commits

Author SHA1 Message Date
Thulinma
a1a195b1e7 Prevent keepalive on non-initialized userClients when negotiating. 2015-07-22 10:27:41 +02:00
Thulinma
232fc9ff0a Merge branch 'development' into LTS_development 2015-07-22 09:53:46 +02:00
Thulinma
27240abd06 Clarified debug messages, tweaked verbosity levels. 2015-07-22 09:53:36 +02:00
Thulinma
0bda57fa0c When reconnecting, close old connections to userClient/statsPage first to prevent accidental killing of outputs. 2015-07-22 09:53:04 +02:00
Thulinma
569ef07f29 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	src/output/output_http_internal.cpp
2015-07-21 23:51:46 +02:00
Thulinma
dc6b4ca0b9 Gave MistOut processes the ability to restart MistIn processes and/or reconnect to them as/if needed. 2015-07-21 23:36:32 +02:00
Thulinma
fce83c903b Make internal HTTP output correctly serve embed codes for newer stream types. 2015-07-21 23:07:41 +02:00
Thulinma
c3efc1001f Improved startInput function behaviour and reliability, added streamAlive function. 2015-07-21 23:07:10 +02:00
Thulinma
dcde050143 Improved debug messages for all MistIn processes, added ability to manually kill MistIn processes. 2015-07-21 22:23:47 +02:00
Thulinma
87676ff669 Merge branch 'development' into LTS_development 2015-07-20 12:52:35 +02:00
Thulinma
7647430cf3 Fixed segfault in MistIn processes being run at high debug levels. 2015-07-11 01:16:00 +02:00
Thulinma
9c25e9fa79 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.h
2015-07-11 01:07:36 +02:00
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
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
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
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