Commit graph

321 commits

Author SHA1 Message Date
Thulinma
a2e2ddae1e Backport of 3.0 stream selectors 2019-11-27 10:27:14 +01:00
Thulinma
7bffdfe644 Added global configuration mechanism and defaultStream support 2019-10-31 11:19:54 +01:00
Thulinma
5be878bea5 Added support for precise splitting of pushes to disk (i.e. recording) with re-variable-ized target strings at each split 2019-09-30 16:28:10 +02:00
Thulinma
a071b365e5 Added support for duration push parameter, fixed skipping forward in recordings 2019-09-30 16:28:10 +02:00
Thulinma
2cb20efa7a Added pushdelay option for outward pushes, fixed negative starttime for RTMP output 2019-08-22 17:12:21 +02:00
Thulinma
118978aafc Updated usage of socket lib in accordance to socket lib edits 2019-08-14 11:42:12 +02:00
Thulinma
fd34aa7e32 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	src/output/output.cpp
#	src/output/output_hls.cpp
2019-04-26 17:10:02 +02:00
Thulinma
095a60e0ed HLS stream track selector support in index URLs, fixed source matching when multi-select or type-select is used, handle user agent exceptions in Output::selectDefaultTracks(), added Util::codecString to stream.h library, removed duplicate/wrong code from DASH/HLS outputs 2019-04-26 17:03:42 +02:00
Thulinma
b8415d09c6 HLS/DASH stream track selector support in index URLs, fixed source matching when multi-select or type-select is used, handle user agent exceptions in Output::selectDefaultTracks(), added Util::codecString to stream.h library, removed duplicate/wrong code from DASH/HLS outputs 2019-04-26 13:50:39 +02:00
Thulinma
c0f72a9b75 Merge branch 'development' into LTS_development 2019-02-06 22:03:48 +01:00
Thulinma
a53661af55 Fixed weird loading issue? 2019-02-06 22:03:36 +01:00
Thulinma
05a345b832 Added support for "none" track selection 2019-02-05 15:42:38 +01: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
7f3b61978f Shared memory logic fix for quick disconnecting users, small tweak to sync byte reporting 2019-01-09 09:29:32 +01:00
Thulinma
ec0b19b92c Socket library updates to support detecting sockets passed as FDs, removed use of peek() in HTTP request handler, fixed 100% CPU usage problem for unfinished HTTP requests 2018-11-28 12:01:57 +01:00
Thulinma
6a6dd5d7ed Socket library updates to support detecting sockets passed as FDs, removed use of peek() in HTTP request handler, fixed 100% CPU usage problem for unfinished HTTP requests 2018-11-28 11:59:54 +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
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
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
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
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
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
df6862fb0a Generalized "rate" parameter, added start/stop/startunix/stopunix params for progressive HTTP outputs 2018-11-01 16:38:26 +01: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
b35d56cd8f Added ability to override internal UDP API bound host/port 2018-10-07 16:06:20 +02:00
Thulinma
c392e3f6f9 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.cpp
2018-08-30 13:53:21 +02:00
Thulinma
4f7b902453 JSON blocking fix + output reselect fix for early stream times 2018-08-30 13:52:27 +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
84de51ab8c Merge branch 'development' into LTS_development 2018-08-24 20:05:14 +02:00
Thulinma
01e15663e9 Improved seek function for real-time protocols 2018-08-24 20:05:08 +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
d48967d549 Improved selectDefaultTracks function to give feedback on selection changes. 2018-07-04 11:51:03 +02:00
Thulinma
2a028fa309 Added bootMsOffset to DTSC::Meta, RTMP now syncs on it. 2018-07-04 11:50:44 +02:00
Thulinma
0ee58e3096 Improved audio/video/subtitle GET param selectors to no longer select tracks when unable to select requested tracks 2018-07-04 11:50:27 +02:00
Thulinma
b352b17de8 Improved track selection logic for JSON output 2018-07-04 11:50:23 +02:00
Thulinma
9723159592 Improved selectDefaultTracks function to give feedback on selection changes. 2018-07-04 11:48:36 +02:00
Thulinma
43934cf69c Added bootMsOffset to DTSC::Meta, RTMP now syncs on it. 2018-07-04 11:48:14 +02:00
Thulinma
1451b64e00 Improved track selection logic for JSON output 2018-07-04 11:19:02 +02:00