Commit graph

69 commits

Author SHA1 Message Date
Thulinma
422caafde2 Added extra fields to RECORDING_END trigger:
- time of connection start
- time of connection end
- duration of media
- first media timestamp
- last media timestamp
2017-06-23 15:08:47 +02:00
Thulinma
78844a6eec Fixed RTMP push out to YT (possibly others) 2017-05-11 17:13:30 +02:00
Thulinma
9ddfa97148 Added automatic User-Agent stream tagging 2017-04-18 12:33:54 +02:00
Thulinma
746d982d28 bufferLivePacket improvements for generic Outputs 2017-03-16 17:15:50 +01: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
7b1ef6c76e Fixed RTSP input not counting as input, fixed UDP-style input disconnect bug
# Conflicts:
#	src/output/output.h
2017-02-02 11:31:00 +01:00
Thulinma
c867ea6d26 Merge branch 'development' into LTS_development 2017-01-31 14:41:41 +01:00
Thulinma
40f1cec8f9 Added 5 minute timeout to idle connections 2017-01-31 14:38:49 +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
ba2ef09a7e Replaced completeKeysOnly variable by more versatile needsLookAhead variable 2017-01-10 12:33:13 +01:00
Thulinma
0c673364d2 Added RECORDING_END trigger 2016-12-28 16:53:07 +01:00
Thulinma
1fde08e333 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
2016-11-18 15:34:48 +01:00
Thulinma
ee4e0461b4 Saver thisPacket handling in generic Output class, better documentation of internals 2016-11-18 15:33:36 +01:00
Thulinma
7c37620294 Merge branch 'development' into LTS_development 2016-11-16 16:33:01 +01:00
Thulinma
374c9fd0ff Listener externalized 2016-11-16 16:32:50 +01:00
Thulinma
6e7d2c2d4a Removed GeoIP support fully 2016-09-15 16:18:21 +02:00
Thulinma
63c0dbb18d Merge branch 'development' into LTS_development 2016-09-02 17:51:01 +02:00
Thulinma
a93fddf4e2 Added DTSC keep alive for idle connections 2016-09-02 17:50:52 +02:00
Thulinma
4538efb89b Added/improved start/endTime functions in Output class 2016-09-02 14:48:19 +02:00
Thulinma
5c8ebdc5ec Merge branch 'development' into LTS_development
# Conflicts:
#	lib/h264.cpp
2016-09-02 14:45:25 +02:00
Thulinma
63ea74d792 Added/improved start/endTime functions in Output class 2016-09-02 14:39:22 +02:00
Thulinma
ae2e67e1bb Merge branch 'development' into LTS_development 2016-08-03 10:00:42 +02:00
Thulinma
2c44be003c Add method endTime() to outputs to get end of stream time in ms 2016-08-03 10:00:37 +02:00
Thulinma
2294fbd365 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_dtsc.cpp
#	src/output/output.cpp
2016-07-28 20:50:29 +02:00
Thulinma
0232417512 Added method to count currently playing tracks in Output classes 2016-07-28 20:44:15 +02:00
Thulinma
5076c89c6d Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
#	src/output/output.cpp
2016-07-23 13:13:28 +02:00
Thulinma
b7c3d7dc44 Various stability and verbosity tweaks for DTSC, RTMP and in general 2016-07-23 13:11:25 +02:00
Thulinma
7c89122a52 Improved output default seek position and completeKeyReady logic 2016-06-10 14:17:42 +02:00
Thulinma
fecfc20052 Improved output default seek position and completeKeyReady logic 2016-06-07 15:24:11 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
7398a88f2f Removed some dead old Pro code. 2016-05-31 20:21:21 +02:00
Thulinma
0d5719f76c Improved generic prepareNext() and stats() handling 2016-05-27 14:02:37 +02:00
Thulinma
d05ae8fa23 More debug output for handling timed out tracks, including possible workaround and/or fix. 2016-05-25 13:16:19 +02:00
Thulinma
5759dbef0f Added "invalidate_sessions" API call, made USER_NEW trigger even more atomic. 2016-05-20 13:06:37 +02:00
Thulinma
bb1c919948 Checksum and sync byte fixes. 2016-05-19 00:16:52 +02:00
Thulinma
edb1d5ca67 Added generic session ID overrider. 2016-05-18 13:24:23 +02:00
Thulinma
dfc41cc596 Prometheus stats split over viewers, incoming and outgoing.
Load balancer updated to use new split stats and provide info per host and/or stream if requested over its port.
2016-05-15 00:20:53 +02:00
Erik Zandvliet
a5a9facc22 DTSC Pull optimizes and quick-negotiate. 2016-05-13 17:27:25 +02:00
Thulinma
263dee7b25 Added push-related API calls to controller, made outputs able to wait for playable streams. 2016-05-11 13:55:23 +02:00
Thulinma
7e82673a13 Minor fixes. 2016-05-05 16:05:12 +02:00
Erik Zandvliet
dda0ea669c Fully implemented DTSC pull support 2016-05-05 16:05:12 +02:00
ozzay
1c3e143709 Recording functionality by Diederick Huijbers, slightly tweaked. 2016-02-12 16:29:08 +01:00
Erik Zandvliet
c0b5f0d4b1 X-Real-IP support 2016-02-12 16:29:08 +01:00
Thulinma
53febd82d1 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2016-02-12 16:18:54 +01:00
Thulinma
d56e7f1408 Added a proxy in Output for getting the host (by Erik Zandvliet) 2016-02-12 15:51:54 +01:00
Thulinma
279add438a Implemented triggers.
Merged from code by Wouter Spruit, with additions by yours truly.
2015-10-14 10:48:00 +02:00
Thulinma
f562369db2 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/mp4.cpp
#	lib/mp4_generic.cpp
#	lib/mp4_generic.h
2015-09-03 22:03:24 +02:00
Thulinma
17f3a37454 Added ability for outputs to elect to only receive completed (i.e.: whole) keyframes, by Oswald de Bruin. 2015-09-03 20:24:35 +02:00
Thulinma
569ef07f29 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	src/output/output_http_internal.cpp
2015-07-21 23:51:46 +02:00