Commit graph

2268 commits

Author SHA1 Message Date
Thulinma
fd34aa7e32 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	src/output/output.cpp
#	src/output/output_hls.cpp
2019-04-26 17:10:02 +02:00
Thulinma
b86ea9adc8 Removed old HLS code 2019-04-26 17:08:35 +02:00
Thulinma
095a60e0ed HLS stream track selector support in index URLs, fixed source matching when multi-select or type-select is used, handle user agent exceptions in Output::selectDefaultTracks(), added Util::codecString to stream.h library, removed duplicate/wrong code from DASH/HLS outputs 2019-04-26 17:03:42 +02:00
Thulinma
74dfe6a329 DASH fix 2019-04-26 15:02:33 +02:00
Thulinma
b8415d09c6 HLS/DASH stream track selector support in index URLs, fixed source matching when multi-select or type-select is used, handle user agent exceptions in Output::selectDefaultTracks(), added Util::codecString to stream.h library, removed duplicate/wrong code from DASH/HLS outputs 2019-04-26 13:50:39 +02:00
Thulinma
51a65209fa Merge branch 'development' into LTS_development 2019-04-26 11:06:33 +02:00
Thulinma
09d4bb6318 Added improved HLS output error handling 2019-04-19 14:14:17 +02:00
Thulinma
0deb9a6aee Make licensing system use HTTPS if SSL support is enabled. 2019-03-20 21:22:09 +01:00
Thulinma
8ac88c4612 Fixed balancer for new lib merge 2019-03-07 09:25:14 +01:00
Thulinma
467b1cc877 Pass GET params for .html page to stream URLs 2019-03-06 15:41:00 +01:00
Thulinma
08cce15193 Fixed controller SYSTEM_START trigger failure when not configured 2019-03-06 10:30:44 +01:00
Thulinma
1c85b7b879 Merge branch 'development' into LTS_development 2019-03-06 10:30:37 +01:00
Thulinma
d5dbb57c84 Fixed null members in stream configs causing failures 2019-03-06 10:30:30 +01:00
Thulinma
2d09501073 DASH fixes, thanks to and/or via Erik and/or Noisypeak 2019-02-28 13:18:13 +01:00
Thulinma
f38c838cfd Fixed SYSTEM_START trigger ignoring return value 2019-02-28 13:16:02 +01:00
Thulinma
132aea4536 Smooth streaming fixed 2019-02-28 13:16:02 +01:00
Thulinma
c6172a96ff HLS input speedup, TS Stream speedup 2019-02-28 13:16:02 +01:00
Thulinma
6c8c3ee6e3 Merge branch 'development' into LTS_development 2019-02-19 14:02:34 +01:00
Thulinma
8069f0f72f Tweaked EBML priority, blacklisted Android 2019-02-19 14:02:29 +01:00
Thulinma
c0f72a9b75 Merge branch 'development' into LTS_development 2019-02-06 22:03:48 +01:00
Thulinma
a53661af55 Fixed weird loading issue? 2019-02-06 22:03:36 +01:00
Thulinma
9bd6e757bb Added stream name display in debug messages for MistOutDTSC 2019-02-05 16:47:59 +01:00
Thulinma
05a345b832 Added support for "none" track selection 2019-02-05 15:42:38 +01:00
Thulinma
01d43796ad 32-bit fixes 2019-01-26 00:51:30 +01:00
Thulinma
9e1539a2b9 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_statistics.cpp
#	src/input/input_buffer.cpp
#	src/input/input_dtsc.cpp
#	src/input/input_ebml.cpp
#	src/input/input_flv.cpp
#	src/input/input_mp3.cpp
#	src/output/output_httpts.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_progressive_mp4.cpp
2019-01-25 23:57:42 +01:00
Thulinma
7565704fdc Fixed 32-bit compile issues 2019-01-25 23:49:56 +01:00
Thulinma
9d58019449 Merge branch 'development' into LTS_development 2019-01-25 22:05:35 +01:00
Thulinma
9671e385ce Added stream name to logs over websocket API 2019-01-25 22:04:26 +01:00
Thulinma
a7a09d22bd Fixed ts_stream class, improved HLS input, added https support to HLS analyser 2019-01-24 14:41:28 +01:00
Thulinma
e3e5b39a62 Merge branch 'development' into LTS_development 2019-01-24 14:41:03 +01:00
Thulinma
b2c9cc2c1b Added stream name to logs API call responses 2019-01-24 14:40:56 +01:00
Thulinma
d82fc394e1 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_api.cpp
2019-01-16 15:53:57 +01:00
Thulinma
14889fa35b Added release string to API version response 2019-01-16 15:49:08 +01:00
Thulinma
483b0007d1 Fixed info/json websockets staying open forever 2019-01-16 15:44:20 +01:00
Thulinma
80ef348025 Fixed info/json websockets staying open forever 2019-01-16 15:43:57 +01:00
Thulinma
786ff05767 RTSP authentication support improvements 2019-01-16 14:26:48 +01:00
Thulinma
3977bad570 Merge sessions option in HLS output now supports caching properly 2019-01-14 16:53:05 +01:00
Thulinma
1dbac0d11a More DASH edits 2019-01-10 13:49:26 +01:00
Thulinma
84091f4ec8 Some minor fixes to IDs in DASH manifests 2019-01-09 11:38:24 +01:00
Thulinma
7f3b61978f Shared memory logic fix for quick disconnecting users, small tweak to sync byte reporting 2019-01-09 09:29:32 +01:00
Thulinma
b99d8cf330 Merge branch 'development' into LTS_development 2019-01-07 10:15:30 +01:00
Thulinma
104e5ed550 Fixed friendly name for FLV, JSON and RAW 2019-01-07 10:15:22 +01:00
Thulinma
c926637aec Merge branch 'development' into LTS_development 2018-12-19 15:47:22 +01:00
Cat
ac7659614a Embed rework 2018-12-19 15:34:26 +01:00
Thulinma
98054f268f Fixed DTSC analyser 2018-12-14 20:49:27 +01:00
Thulinma
e63c65ea37 Fixed DTSC/RTSP analysers 2018-12-14 20:48:48 +01:00
Thulinma
d36a9664f7 Fixed incorrect stream specific flag for RTMP_PUSH_REWRITE trigger capabilties 2018-12-14 16:44:37 +01:00
Thulinma
8b7757c8e9 Added trigger statistics to Prometheus-style outputs, fixed executable triggers not correctly responding with the default on execv fail 2018-12-13 16:48:57 +01:00
Thulinma
ef85ebda75 Merge branch 'development' into LTS_development 2018-12-13 13:41:56 +01:00
Thulinma
9d7c6ddf29 Added missing CORS headers for 415 responses 2018-12-13 13:41:50 +01:00