Thulinma
|
065f98e8e2
|
Merge branch 'development' into LTS_development
# Conflicts:
# lib/defines.h
# src/controller/controller.cpp
# src/controller/controller_storage.cpp
# src/controller/controller_streams.cpp
# src/output/output_http.cpp
|
2018-11-28 11:49:01 +01:00 |
|
Thulinma
|
98e3940079
|
Robustify accesses to server config
|
2018-11-28 11:46:33 +01:00 |
|
Thulinma
|
ac92e09262
|
Robustify accesses to server config
|
2018-11-28 11:46:22 +01:00 |
|
Thulinma
|
6032f236d2
|
TS analyser readability improvement
|
2018-11-28 10:56:07 +01:00 |
|
Thulinma
|
eeb4269b9b
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output.cpp
|
2018-11-28 10:38:54 +01:00 |
|
Thulinma
|
63050951bc
|
Fixed ARM compiles
|
2018-11-28 10:38:28 +01:00 |
|
Thulinma
|
d36faa340a
|
Fixed ARM compiles
|
2018-11-28 10:37:44 +01:00 |
|
Thulinma
|
1aab91e777
|
Do not print HTTP error messages when recording to file
|
2018-11-19 14:04:12 +01:00 |
|
Thulinma
|
e00247af87
|
Merge branch 'development' into LTS_development
|
2018-11-19 14:04:06 +01:00 |
|
Thulinma
|
6cc94a28da
|
Do not clear stream name when failing
|
2018-11-19 14:04:00 +01:00 |
|
Thulinma
|
552240b528
|
Make FLV input read until errors, instead of aborting entirely.
|
2018-11-19 14:03:53 +01:00 |
|
Thulinma
|
6e644e493f
|
Merge branch 'development' into LTS_development
|
2018-11-15 10:59:33 +01:00 |
|
Thulinma
|
739c132a61
|
Added CORS headers to HTTP error messages
|
2018-11-15 10:59:24 +01:00 |
|
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 |
|