Commit graph

204 commits

Author SHA1 Message Date
Thulinma
de1d202457 Made RTSP max send value runtime configurable. 2015-10-14 14:30:28 +02:00
Thulinma
e3f324e9af Merge branch 'development' into LTS_development 2015-10-14 11:19:08 +02:00
Thulinma
b28b463662 Improved HLS bandwidth accuracy. 2015-10-14 11:18:56 +02: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
9f5f90adcf Fix missing c_str() in RTSP warning message. 2015-09-08 18:38:34 +02:00
Thulinma
174de9dfb8 Fixed RTSP for folder and multiple live streams. 2015-09-05 13:24:04 +02:00
Thulinma
ecbbaa4637 MP4 live streaming support by Oswald de Bruin. 2015-09-03 22:28:19 +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
d8051984f2 Merge branch 'development' into LTS_development 2015-09-03 17:55:47 +02:00
Thulinma
096b289cdf Updated --version argument to give more detailed output. 2015-09-03 17:54:20 +02:00
Erik Zandvliet
0913d2607e Working PlayReady/Verimatrix DRM support 2015-09-02 12:09:37 +02:00
Thulinma
2817560006 Merge branch 'development' into LTS_development 2015-08-04 19:53:14 +02:00
Thulinma
7f1a76afa3 Changes to make VLC work again. 2015-08-04 19:53:07 +02:00
Thulinma
76ebcd4735 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_ts_base.cpp
2015-08-04 11:35:20 +02:00
Thulinma
45e82e76eb Fixed HLS live playback on Apple devices, by resetting internal timestamps to zero for the beginning of all segments. 2015-08-04 11:34:51 +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
7b696f6f83 Fixed DASH live support for DASH-IF player. 2015-07-30 11:53:30 +02:00
Thulinma
e36b05500b Major DASH cleanup/bugfix spree: live DASH now works in bitmovin player. 2015-07-29 22:59:39 +02:00
Thulinma
bf1e2c8083 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hss.cpp
2015-07-28 20:40:39 +02:00
Thulinma
b7b2bb5f68 Added CORS headers to HSS output, added HTTP OPTIONS support to HLS and HSS outputs. 2015-07-28 20:23:06 +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
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
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
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
3920ce38b5 Small fix in playback speed, when resuming playback 2015-06-23 11:12:42 +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
a936d1c737 Merge branch 'development' into LTS_development 2015-06-12 23:58:35 +02:00