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

1026 commits

Author SHA1 Message Date
Thulinma
bee6ba11e6 Fixed RTSP. 2016-02-12 16:33:01 +01:00
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
Erik Zandvliet
1866e4e1e1 Updated CORS headers and the (HTTP) output protocols to work with it. 2016-01-26 14:34:14 +01:00
Erik Zandvliet
3f93ca5f82 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_progressive_mp4.cpp
 2016-01-26 14:33:23 +01:00
Erik Zandvliet
a39350f83e CORS Headers 2016-01-26 14:31:09 +01:00
Erik Zandvliet
90a53ddf70 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_hds.cpp
 2016-01-26 14:15:17 +01:00
Erik Zandvliet
3c48a6c03c Embedding of flash players 2016-01-26 14:14:12 +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
78d69673f3 Fix HLS start issues for live streams. 2015-12-25 14:47:20 +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
233b31ddee Added RTMP_PUSH_REWRITE trigger. 2015-11-27 10:44:21 +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
Balder
689129e805 Merge branch 'development' into LTS_development 2015-11-19 14:04:22 +01:00
Balder
d8bfe8cebc Fixed ability to disable video or audio tracks from HTTP output. 2015-11-19 14:02:21 +01:00
Balder
7d9d4e26ae fixed LTS tag for request url 2015-11-19 13:53:22 +01:00
Thulinma
4db86ab2bb Fixed HTTP-based CONN_PLAY triggers URLs 2015-11-12 10:13:16 +01:00
Thulinma
35b2dd6bee Better working TS input, Pro side. Code by Erik Zandvliet. 2015-11-05 17:11:04 +01:00
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