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
|
363df9aacf
|
Moved getMainSelectedTrack to InOutBase class
|
2018-01-24 18:59:29 +01:00 |
|
Thulinma
|
15801aa7b7
|
Track mapping and deletion fixes
|
2017-11-28 11:08:30 +01:00 |
|
Thulinma
|
2dd62e0dce
|
Track mapping and deletion fixes
|
2017-11-28 10:54:52 +01:00 |
|
Thulinma
|
310e7bc5f9
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output.cpp
|
2017-11-23 14:08:32 +01:00 |
|
Thulinma
|
c47162bf03
|
Changed page delete failure message into error message
|
2017-11-23 14:06:42 +01:00 |
|
Thulinma
|
8353939d8a
|
Changed bufferLivePacket and related functions to have const DTSC::Packet references
|
2017-07-28 18:58:34 +02:00 |
|
Thulinma
|
dc8bae8dd3
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output.h
|
2017-07-28 18:39:49 +02:00 |
|
Thulinma
|
3eb69ff2c7
|
Changed bufferLivePacket and related functions to have const DTSC::Packet references
|
2017-07-28 18:38:54 +02:00 |
|
Thulinma
|
ca65576510
|
Merge branch 'development' into LTS_development
|
2017-06-09 21:40:30 +02:00 |
|
Thulinma
|
bb5d0dda11
|
Removed bullshit timestamp checks, no longer relevant/needed.
|
2017-06-09 21:40:11 +02:00 |
|
Thulinma
|
14d15ce318
|
Fixed compile warnings
|
2017-05-16 14:25:20 +02:00 |
|
Thulinma
|
0c87ba1f7b
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input.cpp
|
2017-05-12 12:48:58 +02:00 |
|
Erik Zandvliet
|
c56b72dbca
|
Added a couple of IO convenience functions
|
2017-05-12 12:44:14 +02:00 |
|
Thulinma
|
7629b00a4c
|
Merge branch 'development' into LTS_development
|
2017-04-18 12:32:39 +02:00 |
|
Thulinma
|
5e2b29466b
|
Fixes and improvements to generic push-input handling
|
2017-04-18 12:00:58 +02:00 |
|
Thulinma
|
746d982d28
|
bufferLivePacket improvements for generic Outputs
|
2017-03-16 17:15:50 +01:00 |
|
Thulinma
|
eef9303e61
|
bufferLivePacket improvements for generic Outputs
|
2017-03-16 17:12:54 +01:00 |
|
Thulinma
|
8756680d2e
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/io.cpp
|
2017-01-31 15:42:14 +01:00 |
|
Thulinma
|
29f5d200cb
|
Removed breaking Cygwin-specific code
|
2017-01-31 15:41:19 +01:00 |
|
Thulinma
|
7f6b919e4f
|
Merge branch 'development' into LTS_development
|
2016-10-11 15:21:58 +02:00 |
|
Thulinma
|
748960bb44
|
Removed JSON dependency from FLV, sped up FLV input significantly, minor RTMP input speedup
|
2016-10-11 15:13:52 +02:00 |
|
Thulinma
|
915a10207b
|
Merge branch 'development' into LTS_development
|
2016-10-11 15:04:11 +02:00 |
|
Thulinma
|
f22d95b974
|
Prevent memory leak when receiving media loops at a page boundary
|
2016-10-11 15:03:11 +02:00 |
|
Thulinma
|
2374e64552
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output_rtmp.cpp
|
2016-09-02 18:08:17 +02:00 |
|
Thulinma
|
8710a8b988
|
Fixed RTMP offsets and VoD seeking
|
2016-09-02 18:07:38 +02:00 |
|
Thulinma
|
50e8c7638a
|
Verbosity tweak
|
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
|
5bbb54848b
|
Verbosity tweak
|
2016-09-02 14:39:28 +02:00 |
|
Thulinma
|
a9388928c1
|
Merge branch 'development' into LTS_development
|
2016-07-26 13:57:51 +02:00 |
|
Thulinma
|
7afd3415b3
|
Fixed support for VoD assets with a > 8MiB header size
|
2016-07-26 13:57:43 +02:00 |
|
Thulinma
|
16f293cf2c
|
Merge branch 'development' into LTS_development
|
2016-07-23 22:55:41 +02:00 |
|
Thulinma
|
4cef8d7cf5
|
Small fixes for VoD and DTSC pull input
|
2016-07-23 22:55:35 +02:00 |
|
Thulinma
|
10c45dad2a
|
Merge branch 'development' into LTS_development
|
2016-07-23 18:27:27 +02:00 |
|
Thulinma
|
6828a32db0
|
Tweak verbosity of wrong input order message.
|
2016-07-23 18:27:17 +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
|
636e2b3a0a
|
Backported from OS version edits.
|
2016-07-06 16:20:11 +02:00 |
|
Thulinma
|
14e341222f
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input.cpp
|
2016-07-06 16:18:05 +02:00 |
|
Thulinma
|
5c5ab6c058
|
Page limits implemented, performance timer for buffering pages added on debug level 5
|
2016-07-06 16:16:19 +02:00 |
|
Thulinma
|
a131557a43
|
Added proper buffering of not-yet-accepted tracks.
|
2016-06-10 14:18:01 +02:00 |
|
Thulinma
|
e6ff699ad8
|
Added proper buffering of not-yet-accepted tracks.
|
2016-06-07 23:24:52 +02:00 |
|
Thulinma
|
4c9c6fa7ba
|
Backported various little edits from Pro edition.
|
2016-06-02 14:07:21 +02:00 |
|
Thulinma
|
d048aaccc4
|
Forwardported some free version changes to Pro.
|
2016-05-30 16:03:52 +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
|
4f5004e2f7
|
Improved deleted index debug message verbosity.
|
2016-05-23 10:38:38 +02:00 |
|
Thulinma
|
4b2a8d4b33
|
Fixed TRID sizes to always be 8kb.
|
2016-05-23 10:38:25 +02:00 |
|
Erik Zandvliet
|
5c4e0d8c54
|
More reasonable size for metadata
|
2016-05-19 17:32:47 +02:00 |
|
Erik Zandvliet
|
91c226e4af
|
Only accept keyframes when we are actually accepted
|
2016-05-19 15:16:51 +02:00 |
|
Erik Zandvliet
|
c9d38107d2
|
Wait for keyframe in live input
|
2016-05-19 13:09:31 +02:00 |
|