hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3072 commits 3 branches 0 tags 29 MiB
Commit graph

52 commits

Author SHA1 Message Date
Thulinma
63c0dbb18d Merge branch 'development' into LTS_development 2016-09-02 17:51:01 +02:00
Thulinma
a93fddf4e2 Added DTSC keep alive for idle connections 2016-09-02 17:50:52 +02:00
Thulinma
4538efb89b Added/improved start/endTime functions in Output class 2016-09-02 14:48:19 +02:00
Thulinma
5c8ebdc5ec Merge branch 'development' into LTS_development 
# Conflicts:
#	lib/h264.cpp
 2016-09-02 14:45:25 +02:00
Thulinma
63ea74d792 Added/improved start/endTime functions in Output class 2016-09-02 14:39:22 +02:00
Thulinma
ae2e67e1bb Merge branch 'development' into LTS_development 2016-08-03 10:00:42 +02:00
Thulinma
2c44be003c Add method endTime() to outputs to get end of stream time in ms 2016-08-03 10:00:37 +02:00
Thulinma
2294fbd365 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_dtsc.cpp
#	src/output/output.cpp
 2016-07-28 20:50:29 +02:00
Thulinma
0232417512 Added method to count currently playing tracks in Output classes 2016-07-28 20:44:15 +02:00
Thulinma
5076c89c6d Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_buffer.cpp
#	src/output/output.cpp
 2016-07-23 13:13:28 +02:00
Thulinma
b7c3d7dc44 Various stability and verbosity tweaks for DTSC, RTMP and in general 2016-07-23 13:11:25 +02:00
Thulinma
7c89122a52 Improved output default seek position and completeKeyReady logic 2016-06-10 14:17:42 +02:00
Thulinma
fecfc20052 Improved output default seek position and completeKeyReady logic 2016-06-07 15:24:11 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
7398a88f2f Removed some dead old Pro code. 2016-05-31 20:21:21 +02:00
Thulinma
0d5719f76c Improved generic prepareNext() and stats() handling 2016-05-27 14:02:37 +02:00
Thulinma
d05ae8fa23 More debug output for handling timed out tracks, including possible workaround and/or fix. 2016-05-25 13:16:19 +02:00
Thulinma
5759dbef0f Added "invalidate_sessions" API call, made USER_NEW trigger even more atomic. 2016-05-20 13:06:37 +02:00
Thulinma
bb1c919948 Checksum and sync byte fixes. 2016-05-19 00:16:52 +02:00
Thulinma
edb1d5ca67 Added generic session ID overrider. 2016-05-18 13:24:23 +02:00
Thulinma
dfc41cc596 Prometheus stats split over viewers, incoming and outgoing. 
Load balancer updated to use new split stats and provide info per host and/or stream if requested over its port.
 2016-05-15 00:20:53 +02:00
Erik Zandvliet
a5a9facc22 DTSC Pull optimizes and quick-negotiate. 2016-05-13 17:27:25 +02:00
Thulinma
263dee7b25 Added push-related API calls to controller, made outputs able to wait for playable streams. 2016-05-11 13:55:23 +02:00
Thulinma
7e82673a13 Minor fixes. 2016-05-05 16:05:12 +02:00
Erik Zandvliet
dda0ea669c Fully implemented DTSC pull support 2016-05-05 16:05:12 +02: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
279add438a Implemented triggers. 
Merged from code by Wouter Spruit, with additions by yours truly.
 2015-10-14 10:48:00 +02:00
Thulinma
f562369db2 Merge branch 'development' into LTS_development 
# Conflicts:
#	lib/mp4.cpp
#	lib/mp4_generic.cpp
#	lib/mp4_generic.h
 2015-09-03 22:03:24 +02:00
Thulinma
17f3a37454 Added ability for outputs to elect to only receive completed (i.e.: whole) keyframes, by Oswald de Bruin. 2015-09-03 20:24:35 +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
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
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
3ef9f70ef7 Small tweaks to output verbosity and include flags. 2015-03-05 13:24:15 +01:00
Thulinma
1e09acbb92 Fixed memory/FD leak in MistOutRTMP. 2015-02-03 18:44:59 +01:00
Thulinma
a47504b5cb Ogg support fixed and re-added. Squash of various commits made by Wouter Spruit. 2014-12-23 13:10:28 +01:00
Thulinma
142ef73f6c Various fixes for live streams. 2014-12-21 13:50:08 +01:00
Thulinma
5e4a56222e Added selectDefaultTracks function. 2014-12-11 03:16:00 +01:00
Thulinma
0438cfcd1d Tweaked default buffer starting position behaviour for outputs. 2014-12-08 17:35:22 +01:00
Thulinma
d457046420 Converted HTTP based outputs to new and improved mechanism, increasing robustness and efficiency. 2014-10-31 00:38:25 +01:00
Thulinma
b325ca96ee Added checksum to stats of HTTP based outputs for later merging of connections. 2014-10-23 15:12:33 +02:00
Thulinma
4d9d5aa5b5 Various fixes to live pushing. 2014-06-16 14:23:55 +02:00
Thulinma
c6e86a697b Various RTMP fixes. 2014-06-07 01:02:56 +02:00