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

1900 commits

Author SHA1 Message Date
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
330117b1f4 Merge branch 'development' into LTS_development 2015-10-13 15:34:58 +02:00
Thulinma
2f4a4660d0 Fixed controller breaking when all connectors are deleted simultaneously. 2015-10-13 15:34:24 +02:00
Thulinma
21ce93f520 Haha. 2015-10-13 12:47:07 +02:00
Thulinma
9c8fbb2ac3 Merge branch 'development' into LTS_development 2015-10-08 14:41:44 +02:00
cat
67dc1848e7 embed mp4 no ff/ie 2015-10-08 14:41:19 +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
6d25774b94 Improved performance of FLV input and generic input IO class. 2015-10-06 16:36:06 +02:00
Thulinma
16d38459b6 Made JSON library non-recursive. 
Co-authored with Diederick.
 2015-10-06 13:21:14 +02:00
Erik Zandvliet
b493976f90 MP4 HEVC fix 2015-10-05 17:08:18 +02:00
Erik Zandvliet
01472ca88d Fix for TS Input CPU Usage 2015-10-05 17:08:10 +02:00
Thulinma
0c94e17e70 Fixed aspect ratios in MP4. 2015-09-29 14:41:34 +02:00
Thulinma
c9a30c2816 Improved on/off display for streams. 2015-09-29 11:03:26 +02:00
Thulinma
24c17e9466 Tuned down debug verbosity for live streams significantly. 2015-09-26 22:41:15 +02:00
Thulinma
9903cd4322 Removed useless debug message. 2015-09-25 21:11:40 +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
Thulinma
5c3ff12946 Fixed support for MP4 files without CTTS box in a track header. 2015-09-25 00:36:09 +02:00
Erik Zandvliet
b32b6c5985 Fixed 2015-09-10 01:02:32 +02:00
Erik Zandvliet
1f4b523b1b Initial TS Input commit 2015-09-10 00:54:55 +02:00
Thulinma
10f0f6bb92 addstream/deletestream requests now no longer send a complete stream list as reply, but instead an incomplete stream list. 2015-09-08 22:42:54 +02:00
Thulinma
9f5f90adcf Fix missing c_str() in RTSP warning message. 2015-09-08 18:38:34 +02:00
Thulinma
76cf297829 Merge branch 'development' into LTS_development 2015-09-08 18:38:00 +02:00
Thulinma
c62b4bf381 Split input handling into separate convert and serve functions. 2015-09-08 18:32:12 +02:00
Thulinma
b400ae20c0 Merge branch 'development' into LTS_development 2015-09-05 20:40:54 +02:00
Thulinma
c096450a8f Disallow < 1s buffer for live, set default from the start. 2015-09-05 20:40:44 +02:00
Thulinma
9b5bea2b15 Set default segment size from the start in buffer. 2015-09-05 20:40:07 +02:00
Thulinma
174de9dfb8 Fixed RTSP for folder and multiple live streams. 2015-09-05 13:24:04 +02:00
Thulinma
ccf1221d48 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_buffer.cpp
 2015-09-04 17:25:12 +02:00
Thulinma
0e55b66e7d Improved track removal timings. 2015-09-04 17:24:28 +02:00
Thulinma
bb7dcd8f2a Merge branch 'development' into LTS_development 2015-09-04 10:12:45 +02:00
Thulinma
2222a37079 Improvements to track negotiation timings and debug message verbosity. 2015-09-04 10:12:30 +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
c8d1c2006e Pro version equivalent of recent free version changes. 2015-09-03 19:56:27 +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
d6922c92f5 Merge branch 'development' into LTS_development 2015-08-28 21:58:43 +02:00