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

297 commits

Author SHA1 Message Date
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
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
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
Thulinma
9e1f0fcb7d Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_buffer.cpp
 2015-11-27 10:44:09 +01:00
Thulinma
c9ddc3fe1a Fixed level of waiting for track debug message. 2015-11-27 10:01:24 +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
eb6b98b219 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/controller/controller.cpp
 2015-10-14 10:38:59 +02:00
Thulinma
3ba11441a1 Improved flow of controller main function, made config file only re-write if updates were actually necessary, failure to open a stream input now fails the output correctly. 2015-10-14 10:25:58 +02:00
Thulinma
6b21e06c76 Merge branch 'development' into LTS_development 2015-10-13 15:56:53 +02:00
Thulinma
73ef41e97b Properly trigger failure state on streams when connection to source fails. 2015-10-13 15:55:26 +02:00
Thulinma
c390035523 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/io.cpp
 2015-10-08 13:58:43 +02:00
Thulinma
c20b8f2081 Fixed newlines in debug messages. Also, backported various Pro edition fixes that belonged in OS edition. 2015-10-08 13:54:54 +02:00
Thulinma
8fb8a98c5f Pro side of JSON library updates. 2015-10-07 11:06:22 +02:00
Thulinma
74c8932106 Merge branch 'development' into json_mod_LTS 
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
 2015-10-07 11:05:49 +02:00
Thulinma
16d38459b6 Made JSON library non-recursive. 
Co-authored with Diederick.
 2015-10-06 13:21:14 +02:00
Thulinma
76529664e6 Merge branch 'development' into LTS_development 2015-09-25 20:58:58 +02:00
Thulinma
94dafb7888 Made generic output debug message about "actually loaded..." clearer, changed level to warn. 2015-09-25 20:58:42 +02:00
Thulinma
1110f79548 Fixed completeKeyReady flag to only wait for selected tracks, not all tracks. 2015-09-25 20:57:09 +02:00
Erik Zandvliet
1f4b523b1b Initial TS Input commit 2015-09-10 00:54:55 +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
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