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

74 commits

Author SHA1 Message Date
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
f3f0904b98 Merge branch 'development' into LTS_development 2015-07-31 23:43:30 +02:00
Thulinma
d2241886e5 Changed output.cpp to use Bitfield library instead of less portable system calls. 2015-07-31 23:43:08 +02:00
Thulinma
232fc9ff0a Merge branch 'development' into LTS_development 2015-07-22 09:53:46 +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
c3efc1001f Improved startInput function behaviour and reliability, added streamAlive function. 2015-07-21 23:07:10 +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
Erik Zandvliet
1b724afc83 Small fix in playback speed, when resuming playback 2015-06-26 18:05:51 +02:00
Erik Zandvliet
3920ce38b5 Small fix in playback speed, when resuming playback 2015-06-23 11:12:42 +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
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
4ee59b9aaf Various fixes 2015-04-03 14:58:06 +02:00
Thulinma
a9a7ff7202 Tweaked debug message verbosity. 2015-04-02 16:32:08 +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
87583dae49 Gracefully shut down outputs when signals are received. 2015-03-05 00:31:45 +01:00
Thulinma
81b7ab9a0e Fix page switching right after an audio track seek. 2015-03-04 18:58:08 +01:00
Thulinma
35ddc79c1a added pid/timeout/kill functionality to stats 
# Conflicts:
#	src/output/output_rtmp.cpp
 2015-03-03 11:33:52 +01:00
wouter spruit
bac101b1e5 added sleep in output_http, fix for high CPU usage 2015-02-25 16:17:10 +01:00
Thulinma
4586289c83 Changed type of debug setting for inputs/outputs to "debug" instead of "uint". 2015-02-20 17:05:51 +01:00
Thulinma
1e09acbb92 Fixed memory/FD leak in MistOutRTMP. 2015-02-03 18:44:59 +01:00
Thulinma
39a386ab18 Stability improvements for live buffers / fixed issues with file extensions in RTMP stream names. 2015-01-29 01:28:46 +01:00
Thulinma
43d35cf29b Converted previously hardcoded default sizes for shared memory pages to defines. 2015-01-27 12:03:52 +01:00
Erik Zandvliet
c99e0bc3ef Fixed a bug where non-video pageswitches were calculated wrong 2015-01-26 11:03:14 +01:00
Thulinma
a001feafca Fixed various live issues. 2014-12-30 02:08:14 +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
9132d38ac0 Fixed seeking when seeking to a timestamp right before a keyframe right after a memory page switch. Also made MP4 progressive output more reliable, improved timers and debugging message clarity. 2014-12-16 11:54:12 +01:00
Thulinma
fac1727e10 Fixed stream-less builtin files loading correctly. 2014-12-13 14:58:32 +01:00
Thulinma
3c45efc9e4 Fixed a typo from an earlier commit. 2014-12-11 12:24:22 +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
55046206fe Fixed various statistics bugs. 2014-12-05 21:31:45 +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
c26661b690 Fixed hostname in statistics to properly be in packed binary format, internally. 2014-10-22 16:51:51 +02:00
Thulinma
8542281ac2 JSON-based input selection. 2014-10-02 16:12:19 +02:00
Thulinma
3fa253c297 Fixed more live stuff. 2014-10-01 13:01:34 +02:00
Thulinma
fc5e86d7c2 Added MistOutHTTPTS, also minor cleanup in output.cpp 2014-09-29 21:04:25 +02:00
ozzay
98e2583b4e Fixed live track deletion on viewer timeout. 2014-09-02 10:58:44 +02:00
Thulinma
0d4adb98cb Extra sanity checks in MistOut* processes. 2014-08-05 16:04:34 +02:00
Thulinma
a15dc736da Fixed "Trying to time-out an element without counters" errors when outputs are shutting down cleanly. 2014-08-05 14:26:55 +02:00
Thulinma
e0d6a18f70 Fixed first page under Windows not being correct size for pushing (Bad, Erik, bad!) 2014-07-24 15:11:14 +02:00