Commit graph

135 commits

Author SHA1 Message Date
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
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
Thulinma
3446d022e8 Added header read speed timers, simplified header logic for VoD. 2017-07-26 17:00:36 +02:00
Thulinma
d42bf9777e Merge branch 'development' into LTS_development
# Conflicts:
#	CMakeLists.txt
#	src/input/input_buffer.cpp
2017-07-22 18:55:12 +02:00
Thulinma
45e4cddec9 Updated Input class with preRun() and checkArguments() instead of single setup() function 2017-07-22 18:53:05 +02:00
Thulinma
0ca63d1440 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	src/input/input.cpp
2017-06-22 14:07:54 +02:00
Thulinma
25699ef8b2 Added stream status shared memory page (temporary system) 2017-06-22 14:03:35 +02:00
Thulinma
1a0548ec68 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
#	src/input/input.h
2017-06-09 20:41:48 +02:00
Thulinma
920efe0b26 Updated serve-type inputs to obey "always on" stream config setting, push inputs no longer counted as viewers. 2017-06-09 20:40:03 +02:00
Thulinma
bef46f969c Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	lib/stream.h
#	src/input/input.cpp
#	src/output/output_http_internal.cpp
2017-06-09 20:34:57 +02:00
Thulinma
26f74accdf MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output. 2017-06-09 20:31:20 +02:00
Thulinma
6bca77d758 Merge branch 'development' into LTS_development 2017-05-23 21:36:55 +02:00
Thulinma
24a1744b7e Input now prints message and aborts cleanly when pull lock could not be opened. 2017-05-23 21:36:49 +02:00
Thulinma
3a4f990143 Removed useless variables in input class 2017-05-15 12:26:38 +02:00
Thulinma
51209e816c Removed useless variables in input class 2017-05-15 12:26:17 +02:00
Thulinma
0c87ba1f7b Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
2017-05-12 12:48:58 +02:00
Thulinma
260894468e Changed input boot sequence to allow for finer control 2017-05-12 12:47:15 +02:00
Thulinma
daa0833970 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.h
#	src/output/output_rtmp.cpp
2017-02-28 14:07:18 +01:00
Thulinma
9a783a782d Unified all push-in-enabled outputs into a single style/function of accepting incoming pushes 2017-02-28 14:05:37 +01:00
Thulinma
88749d2259 Added sourceURI to stream metadata structures 2017-02-28 13:59:38 +01:00
Thulinma
e352a2fc38 Merge branch 'development' into LTS_development 2017-02-28 13:58:09 +01:00
Thulinma
8866b299fb Unified all input types into a single flexible type 2017-02-28 13:57:59 +01:00
Thulinma
dadb1ebde8 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
2017-01-10 12:36:53 +01:00
Thulinma
c6377085f0 Added shutdown reason message in stream-mode inputs 2017-01-10 12:33:30 +01:00
Thulinma
1fde08e333 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
2016-11-18 15:34:48 +01:00
Thulinma
440596c117 Added crash handler for Pull-mode inputs 2016-11-18 15:33:25 +01:00
Thulinma
2aaf6d10f4 Added new generalized input keepRunning() function, FLV input now shuts down if the file is updated file it is active, added 15 second DTSH regeneration window
# Conflicts:
#	src/input/input.cpp
2016-11-14 11:34:58 +01:00