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

1089 commits

Author SHA1 Message Date
Thulinma
babbcf706a Add support for telling iOS devices apart by X-Playback-Session-Id and allow IPv6-mapped IPv4 addresses to be properly recognized by the trusted proxy setting. 2016-04-19 18:26:00 +02:00
Thulinma
08bab96a6a Fixed X-Real-IP header support. 2016-04-19 18:25:49 +02:00
Thulinma
9896b5837e Pro side of encoding fixes. 2016-04-14 12:08:26 +02:00
Thulinma
d20c4f5ec5 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_hss.cpp
#	src/output/output_rtmp.cpp
 2016-04-14 12:05:55 +02:00
Thulinma
66dc2dc0cb Encoding fixes: 
- base64 library renamed to encode library
- Moved urlencode/urldecode functions from HTTP library to encode library
- Moved hex/unhex functions from HTTP library to encode library
- Added urldecode support to RTMP urls, fixing XSplit wildcard stream support
 2016-04-14 12:03:40 +02:00
Thulinma
87e2c774fd Added RTMP unescaping code to fix Xsplit support for wildcard streams. 2016-04-13 16:16:56 +02:00
Erik Zandvliet
4c2eeb96c8 Fix for handling negative h264 offsets in mp4 2016-04-12 15:07:35 +02:00
Thulinma
cbaf4107f9 Silly mistake is silly. 2016-04-05 10:05:11 +02:00
Balder
7710a7d8a7 BalderDash fixes (H264 mp4 codecs weirdness//FF) 2016-02-29 11:35:17 +01:00
Thulinma
f6e2e95b5a Added USER_NEW trigger. 2016-02-19 11:33:40 +01:00
Thulinma
4db2ea97ed HLS now won't remove fragments if <= 3 available 2016-02-19 11:32:41 +01:00
Thulinma
a6ef31d1ea Changed buffer full/empty behaviour to trigger at 3 segments instead of 50% of buffer size. 2016-02-19 11:32:41 +01:00
Thulinma
b6f03a4591 Undo undone stuff. Bad Erik! 2016-02-18 13:33:34 +01:00
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