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
|
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
|
3446d022e8
|
Added header read speed timers, simplified header logic for VoD.
|
2017-07-26 17:00:36 +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
|
25699ef8b2
|
Added stream status shared memory page (temporary system)
|
2017-06-22 14:03:35 +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
|
8866b299fb
|
Unified all input types into a single flexible type
|
2017-02-28 13:57:59 +01:00 |
|
Thulinma
|
440596c117
|
Added crash handler for Pull-mode inputs
|
2016-11-18 15:33:25 +01:00 |
|
Thulinma
|
8d83a203be
|
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
|
2016-11-14 11:01:00 +01:00 |
|
Thulinma
|
fedd18146e
|
Generalized DTSH header reading and writing of Inputs
|
2016-09-15 16:03:24 +02:00 |
|
Thulinma
|
837b2b5d4f
|
Added resume support and quick negotiation support from Pro, as well as support for stream-type inputs.
|
2016-06-02 14:07:21 +02:00 |
|
Thulinma
|
4c9c6fa7ba
|
Backported various little edits from Pro edition.
|
2016-06-02 14:07:21 +02:00 |
|
Thulinma
|
c62b4bf381
|
Split input handling into separate convert and serve functions.
|
2015-09-08 18:32:12 +02:00 |
|
Erik Zandvliet
|
d370ef4eac
|
Working multi-input
|
2015-04-02 09:56:47 +02:00 |
|
Thulinma
|
a47504b5cb
|
Ogg support fixed and re-added. Squash of various commits made by Wouter Spruit.
|
2014-12-23 13:10:28 +01:00 |
|
Thulinma
|
1e66e6c817
|
Removed stats sockets - haven't been in use for a while now.
|
2014-07-09 14:58:55 +02:00 |
|
Thulinma
|
5058addf70
|
Fixed updating of old DTSH files not happening.
|
2014-06-11 16:04:02 +02:00 |
|
Thulinma
|
cd2fe225c5
|
Shared memory rewrite
|
2014-04-04 19:50:40 +02:00 |
|