Commit graph

4145 commits

Author SHA1 Message Date
Thulinma
081d3d986d Merge branch 'development' into LTS_development 2018-11-15 10:36:21 +01:00
Thulinma
ff0b03b01a Stats fixes 2018-11-15 10:36:16 +01:00
Thulinma
0707257127 Stats fixes 2018-11-15 10:36:03 +01:00
Thulinma
89374e4038 Merge branch 'development' into LTS_development 2018-11-13 16:51:50 +01:00
Thulinma
7b8497603e Viewer counter fix 2018-11-13 16:51:45 +01:00
Thulinma
0d9ff7da2e Viewer counter fix 2018-11-13 16:50:46 +01:00
Thulinma
d695b4e5a6 Better onFail handling, better HTTP failure handling
# Conflicts:
#	src/output/output.cpp
2018-11-13 16:35:48 +01:00
Thulinma
109995809d Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http_internal.cpp
2018-11-13 16:35:12 +01:00
Thulinma
251dc5f171 Better onFail handling, better HTTP failure handling 2018-11-13 16:34:30 +01:00
Thulinma
9a2544cc9b Added headless mode to DTSC analyser, will for example analyse MstConf files now 2018-11-13 16:31:08 +01:00
Thulinma
ba34b3b1f7 Fixed compatibility with DU Recorder 2018-11-13 16:30:41 +01:00
Thulinma
7b0da7b65c JSON compareExcept and compareOnly functions now support arrays. 2018-11-13 16:26:19 +01:00
Thulinma
936c47f37e Merge branch 'development' into LTS_development 2018-11-05 16:44:40 +01:00
Thulinma
25bb8aac5f Improved output timing 2018-11-05 16:44:36 +01:00
Thulinma
075756d646 Improved output timing 2018-11-05 16:44:24 +01:00
Thulinma
672c0d55b9 Merge branch 'development' into LTS_development 2018-11-01 17:05:32 +01:00
Thulinma
b12c0254e1 Fixed outputs not reporting their current position accurately, improved buffering behaviour for VoD inputs. 2018-11-01 17:05:25 +01:00
Thulinma
b5d48a006a Fixed outputs not reporting their current position accurately, improved buffering behaviour for VoD inputs. 2018-11-01 17:04:12 +01:00
Thulinma
6e2e7d81b2 TS optimize, specifically MPEG2 speedup 2018-11-01 17:04:05 +01:00
Thulinma
df6862fb0a Generalized "rate" parameter, added start/stop/startunix/stopunix params for progressive HTTP outputs 2018-11-01 16:38:26 +01:00
Thulinma
2bbbf51fb3 Added H264/MP4 keysonly mode, MP4 live simplification 2018-11-01 16:38:21 +01:00
Thulinma
6a5549444b Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
#	src/output/output_ts_base.cpp
2018-11-01 16:37:03 +01:00
Thulinma
425e98c6fd Fixed TS-output (=HLS) related SIGABRT problem 2018-11-01 16:32:11 +01:00
Thulinma
24006648f9 Cleaned up, fixed and robustified semaphore and signal related code 2018-11-01 16:11:47 +01:00
Thulinma
78101d8c91 Merge branch 'development' into LTS_development 2018-10-30 14:59:37 +01:00
Thulinma
ee9b076b76 Limit how long startInput() will wait for an input to finish booting or shutting down 2018-10-30 14:59:32 +01:00
Thulinma
4be1daa60c Fixed TS-output (=HLS) related SIGABRT problem 2018-10-30 14:59:18 +01:00
Thulinma
9c0494c04c Changed not-acceptable RTMP requests from FAIL to INFO level. 2018-10-30 14:58:53 +01:00
Thulinma
03c64340c3 Fixed RTSP mplayer support 2018-10-16 11:11:23 +02:00
Thulinma
8034578fad Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_statistics.cpp
#	src/controller/controller_statistics.h
#	src/output/output.h
#	src/output/output_hls.cpp
#	src/output/output_http.cpp
2018-10-15 14:18:23 +02:00
Thulinma
b2995ea2db Fix statistics in Free edition 2018-10-15 13:43:51 +02:00
Thulinma
cdaf7920b0 Merge branch 'development' into LTS_development 2018-10-15 11:19:32 +02:00
Thulinma
e5bb5faacb Updated GeoIP from freegeoip to use ipstack API instead 2018-10-15 11:19:30 +02:00
Thulinma
dff150419b Prevent statistics going negative when going through server restarts 2018-10-15 11:19:10 +02:00
Thulinma
ce1eef0885 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
#	src/input/input_buffer.cpp
#	src/output/output.cpp
#	src/output/output_progressive_mp4.cpp
#	src/output/output_rtmp.cpp
2018-10-15 10:53:03 +02:00
Thulinma
776cfe1850 Backported various Pro edition changes and general code to Free edition 2018-10-15 10:25:43 +02:00
Thulinma
57e40fe921 Merge branch 'development' into LTS_development 2018-10-11 15:15:40 +02:00
Thulinma
2aa86ccf01 Fix memory leak in live inputs 2018-10-11 15:15:18 +02:00
Thulinma
ae4436216c Make RTMP acceptable connection types a dropdown in the GUI 2018-10-10 15:11:07 +02:00
Thulinma
a0b011325c Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_ebml.cpp
2018-10-10 15:06:09 +02:00
Thulinma
8afad6d574 Added DTS audio support to EBML input/output 2018-10-10 15:05:36 +02:00
Thulinma
ab39cca5f4 Fixed EBML input cutting off zero bytes in places where it's not appropriate 2018-10-10 15:04:37 +02:00
Thulinma
a53fd5fa63 EBML fix for non-static GOP sizes 2018-10-10 15:04:32 +02:00
Thulinma
6fc18ffea3 Merge branch 'development' into LTS_development 2018-10-08 11:27:25 +02:00
Thulinma
3a3498f17c Added nicer error message handler in RTMP output connector 2018-10-08 11:26:49 +02:00
Thulinma
d7c36a0800 Merge branch 'development' into LTS_development 2018-10-07 17:01:11 +02:00
Thulinma
1b137ad3c3 Fixed all-interface IPv6 sockets being created when attempting to listen on a non-IPv6 interface address 2018-10-07 17:01:06 +02:00
Thulinma
c475fc3a1e Added acceptable connection types RTMP option, able to reject either all incoming or outgoing streams on a particular interface. 2018-10-07 16:06:24 +02:00
Thulinma
b35d56cd8f Added ability to override internal UDP API bound host/port 2018-10-07 16:06:20 +02:00
Thulinma
28db254d7b Merge branch 'development' into LTS_development 2018-10-03 23:55:58 +02:00