Commit graph

210 commits

Author SHA1 Message Date
Thulinma
eac05f7ba3 SRT "native" support, NOFORK env variable support for inputs 2019-08-06 14:42:47 +02:00
Thulinma
26c9f964be Merge branch 'development' into LTS_development 2019-05-23 12:42:19 +02:00
Thulinma
d0868d0f42 Added "version" element to JSON outputs of binaries, added version check in controller (ignores mismatched binaries now) 2019-05-23 12:36:45 +02:00
Thulinma
36d0981f87 Merge branch 'development' into LTS_development 2019-05-16 13:49:02 +02:00
Thulinma
488cd0434a Windows fix for stream status 2019-05-16 13:48:57 +02: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
83665c4e3b Merge branch 'development' into LTS_development 2018-11-28 11:55:15 +01:00
Thulinma
3cb03392e1 Added stream name to logging 2018-11-28 11:55:08 +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
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
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
24006648f9 Cleaned up, fixed and robustified semaphore and signal related code 2018-11-01 16:11:47 +01:00
Thulinma
776cfe1850 Backported various Pro edition changes and general code to Free edition 2018-10-15 10:25:43 +02:00
Thulinma
1d4980dca1 Merge branch 'development' into LTS_development 2018-09-08 16:15:55 +02:00
Thulinma
c17064c305 Re-order userClient init for stream-type inputs. 2018-09-08 16:15:47 +02:00
Thulinma
6ddc4adadf Merge branch 'development' into LTS_development 2018-08-27 14:17:20 +02:00
Ramoe
33488da329 Added singular mode override for inputs 2018-08-27 14:13:25 +02:00
Thulinma
b4741abbc2 Merge branch 'development' into LTS_development 2018-08-23 15:31:39 +02:00
Thulinma
791fc5eae9 Added a define for live stream latency 2018-08-23 15:31:22 +02:00
Thulinma
18f9d2682f Added some helpful high-level debug messages to generic IO handlers, fixed missing track selection when streaming live input 2018-07-20 14:22:46 +02:00
Thulinma
fe7cee8666 Added some helpful high-level debug messages to generic IO handlers, fixed missing track selection when streaming live input 2018-07-18 21:22:28 +02:00
Thulinma
bbc31722bd Generalized stream variables implementation
# Conflicts:
#	lib/stream.cpp
2018-05-09 10:40:20 +02:00
Thulinma
92d14f52ea Improved stream start handling 2018-05-09 10:12:35 +02:00
Thulinma
f6bba2f729 Changed default response for Input::isAlwaysOn for non-devel builds from true to false. 2018-02-12 10:57:27 +01:00
Thulinma
ad29c297c2 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/bitfields.h
#	src/input/input.cpp
#	src/output/output.cpp
2018-01-24 19:12:05 +01:00
Thulinma
7c1a6fe7ce Added default implementation of Input::trackSelect 2018-01-24 18:57:30 +01:00
Thulinma
7dd7cc6fe1 Merge branch 'development' into LTS_development 2017-12-13 11:00:08 +01:00
Thulinma
fb88d214fb Changed "No tracks found" input class message to INFO level from WARN level 2017-12-13 10:59:52 +01:00
Thulinma
db511a6e32 Fixed Windows-based live streams 2017-11-29 14:51:36 +01:00
Thulinma
f32ab1d26d Fixed Windows-based live streams 2017-11-29 14:51:17 +01:00
Thulinma
185fd6ebb8 TS input now follows generic code path, AlwaysOn made slightly more persistent 2017-11-28 15:17:08 +01:00
Thulinma
92d0540cfe Fixed srt sideload 2017-11-28 10:54:04 +01:00
Thulinma
f6f11af618 Merge branch 'development' into LTS_development 2017-11-27 11:14:58 +01:00
Thulinma
1767f000cd Improved debug levels for track page loading 2017-11-27 11:14:30 +01:00
Ramoe
b9e261e1ef Reworked existing subtitle support (sideloaded, MP4 in and srt out) 2017-11-23 14:14:52 +01:00
Thulinma
a053b00d49 Merge branch 'development' into LTS_development 2017-11-07 11:12:59 +01:00
Thulinma
7d6bdb5553 Fixed left-over stream state problems 2017-11-07 11:12:02 +01:00
Thulinma
cac503f774 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
2017-10-24 14:09:13 +02:00
Thulinma
a27cf083e6 Added streamMainLoop function to Input class 2017-10-24 14:08:10 +02:00
Erik Zandvliet
0f7f6b3bc7 Sideloaded SRT file support 2017-08-29 10:58:32 +02:00
Thulinma
bb2e6de56a Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
2017-08-03 15:08:48 +02:00
Thulinma
6c4cea3954 Fix for Cygwin input crashes 2017-08-03 15:08:13 +02:00
Thulinma
41ec2822b1 Fixed inputs not obeying the SIMUL_TRACKS setting 2017-08-03 15:08:04 +02:00
Thulinma
dc8bae8dd3 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.h
2017-07-28 18:39:49 +02:00
Erik Zandvliet
c895a6b7e2 Added codec to "Done buffering" message 2017-07-28 18:39:09 +02:00
Thulinma
6b1db9d0ec Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
2017-07-26 17:01:52 +02:00