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

61 commits

Author SHA1 Message Date
Thulinma
3c41142a57 RTMP track re-selection timer added. 2016-06-07 15:25:36 +02:00
Thulinma
1818aca35b Fixed RTMP push failing if wait time too long. 2016-06-06 16:30:52 +02:00
Thulinma
fcd11f44c4 Optimized waiting for streams/tracks. 2016-06-06 16:30:30 +02:00
Thulinma
d048aaccc4 Forwardported some free version changes to Pro. 2016-05-30 16:03:52 +02:00
Thulinma
58c3475ca9 Allow (re)selecting newly (re)appeared tracks in RTMP output. 2016-05-27 15:02:39 +02:00
Thulinma
070b4d7866 RTMP push output fixes, RTMP input read fixes. 2016-05-25 14:36:44 +02:00
Thulinma
e65c43defc Made RTMP push output not work in real-time mode, but fast-as-possible mode. 2016-05-25 13:16:19 +02:00
Thulinma
aac1fcc351 Tweaked output log message verbosity 2016-05-24 11:07:01 +02:00
Thulinma
477d5e8899 Make maxkbps default unlimited. 2016-05-19 13:00:39 +02:00
Thulinma
8d3daf4def Swapped RTMP and HDS in priority ordering for playback options. 2016-05-19 10:32:48 +02:00
Thulinma
219e326048 RTMP rate-limiting implemented, RTMP push now supports leaving off the target stream name. 2016-05-16 16:48:21 +02:00
Thulinma
dfc41cc596 Prometheus stats split over viewers, incoming and outgoing. 
Load balancer updated to use new split stats and provide info per host and/or stream if requested over its port.
 2016-05-15 00:20:53 +02:00
Erik Zandvliet
a5a9facc22 DTSC Pull optimizes and quick-negotiate. 2016-05-13 17:27:25 +02:00
Thulinma
4a3c2a055b Fixed urldecoding for receiving RTMP pushes. 2016-05-12 14:49:19 +02:00
Thulinma
fcdf788596 Implemented RTMP push output. 2016-05-12 14:49:19 +02:00
Thulinma
263dee7b25 Added push-related API calls to controller, made outputs able to wait for playable streams. 2016-05-11 13:55:23 +02:00
Thulinma
f4b296164e Fixed all semaphore instances not being cleaned up properly. 2016-05-03 12:13:58 +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
c25a533729 Recording, HLS Push, UDP (Multicast) Input, Threaded TS 2016-02-12 16:30:33 +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
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
233b31ddee Added RTMP_PUSH_REWRITE trigger. 2015-11-27 10:44:21 +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
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
a936d1c737 Merge branch 'development' into LTS_development 2015-06-12 23:58:35 +02:00
Thulinma
0789cc46d2 Implemented RTMP calls ping and FCSubscribe, fixed a few RTMP typoes, added error handler for unsupported commands. 2015-06-12 23:58:23 +02:00
Thulinma
993801789a Merge branch 'development' into LTS_development 2015-05-21 19:16:22 +02:00
Thulinma
17aa6bbbb6 Compatibility improvements as well as simplification to RTMP push input. 2015-05-21 19:10:05 +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
d370ef4eac Working multi-input 2015-04-02 09:56:47 +02:00
Thulinma
4e50f13d03 Fixed VLC-specific format RTMP URLs. 2015-02-12 12:47:00 +01:00
Thulinma
39a386ab18 Stability improvements for live buffers / fixed issues with file extensions in RTMP stream names. 2015-01-29 01:28:46 +01:00
Thulinma
43d35cf29b Converted previously hardcoded default sizes for shared memory pages to defines. 2015-01-27 12:03:52 +01:00
Thulinma
c48ef1e4eb Improved RTMP push reject message clarity. 2014-11-07 16:31:25 +01:00
Thulinma
8542281ac2 JSON-based input selection. 2014-10-02 16:12:19 +02:00
Thulinma
dfd914120e Changed RTMP output references to Socket::Send into Socket::SendNow 2014-09-24 16:26:16 +02:00
Thulinma
c33c62c6d4 Added support for remaining Flash-supported codecs to RTMP, FLV and HDS. 2014-09-06 14:39:35 +02:00
Thulinma
3d9f603c4b Fixed non-H264 video tracks for FLV, HDS and RTMP outputs. 2014-08-07 21:49:56 +02:00
Erik Zandvliet
fefd0e2f6f Two small fixes to repair rtmp re-pushing 2014-06-23 15:08:26 +02:00
Thulinma
f538bd0d93 smil support by Oswald de Bruin 2014-06-20 19:58:05 +02:00
Thulinma
80b905965e Various tweaks and fixes from Erik. 2014-06-19 16:51:02 +02:00
Thulinma
c6e86a697b Various RTMP fixes. 2014-06-07 01:02:56 +02:00