Thulinma
|
046d89d50c
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output.cpp
|
2016-11-22 10:15:30 +01:00 |
|
Thulinma
|
74e433e298
|
Fixed track autoselect to not be so prejudiced against MP3
|
2016-11-22 09:56:37 +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
|
d3f65561f6
|
Merge branch 'development' into LTS_development
|
2016-11-16 10:55:25 +01:00 |
|
Thulinma
|
3a0beea1fc
|
Fixed startTime() bug in Output
|
2016-11-16 10:55:18 +01:00 |
|
Thulinma
|
3f14db4b12
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input.cpp
# src/output/output.cpp
|
2016-11-14 11:29:24 +01:00 |
|
Thulinma
|
94e39f8323
|
Fixed JIT timestamps for live
|
2016-11-14 10:55:58 +01:00 |
|
Thulinma
|
0eef699b45
|
Only retrieve stream source if no tracks available
|
2016-11-14 10:53:02 +01:00 |
|
Thulinma
|
0b78a57e40
|
Added shared memory session cache + instant-sync for sessions in cache.
|
2016-10-11 16:42:47 +02:00 |
|
Thulinma
|
59ae4f5aca
|
Merge branch 'development' into LTS_development
|
2016-10-11 16:41:15 +02:00 |
|
Thulinma
|
8a0799a0b8
|
Optimized output waiting time algorithm
|
2016-10-11 16:22:05 +02:00 |
|
Thulinma
|
7f6b919e4f
|
Merge branch 'development' into LTS_development
|
2016-10-11 15:21:58 +02:00 |
|
Thulinma
|
92e73cb6db
|
Fixed bug when tracks pause for 16 seconds.
|
2016-10-11 15:13:34 +02:00 |
|
Thulinma
|
11d8ef922d
|
Merge branch 'development' into LTS_development
|
2016-10-11 15:12:29 +02:00 |
|
Thulinma
|
82a2fb3367
|
Fixed eternal sleeping bug in outputs, fixed some missed thisPacket invalid pointer issues.
|
2016-10-11 15:12:12 +02:00 |
|
Thulinma
|
6e7d2c2d4a
|
Removed GeoIP support fully
|
2016-09-15 16:18:21 +02:00 |
|
Thulinma
|
1172768c34
|
Merge branch 'development' into LTS_development
# Conflicts:
# lib/shared_memory.cpp
# src/controller/controller.cpp
# src/controller/controller_storage.h
# src/output/output.cpp
|
2016-09-15 16:17:06 +02:00 |
|
Thulinma
|
49cb493b7e
|
Improved output connect to input timeout behaviour
|
2016-09-15 16:03:24 +02:00 |
|
Thulinma
|
53dfcfe131
|
Fixed VoD no-load/slow-load 100% CPU usage
|
2016-09-15 16:03:24 +02:00 |
|
Thulinma
|
4472d00e69
|
Improved sharedClient isAlive handling
|
2016-09-15 16:03:24 +02:00 |
|
Thulinma
|
bd4c951488
|
Fixed segfault in VoD outputs with corrupted headers
|
2016-09-15 15:46:04 +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
|
6a0d2834c5
|
Merge branch 'development' into LTS_development
|
2016-07-29 09:48:49 +02:00 |
|
Thulinma
|
bd174d6db0
|
Fix seek-to-end issues with very near-live outputs
|
2016-07-29 09:48:43 +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
|
5f6abd291d
|
Tweaks to output drop behaviour
|
2016-07-22 14:30:40 +02:00 |
|
Thulinma
|
55528a014a
|
Added track drop message
|
2016-07-22 14:11:47 +02:00 |
|
Thulinma
|
4eb0a7c56c
|
Fix RTMP buffering
|
2016-07-22 12:39:07 +02:00 |
|
Thulinma
|
ab95786984
|
Fix RTMP buffering
|
2016-07-22 12:38:54 +02:00 |
|
Thulinma
|
d7b1f05b51
|
Pro side of RTMP fixes
|
2016-07-21 11:50:24 +02:00 |
|
Thulinma
|
2f6cd40fb3
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output_rtmp.h
|
2016-07-21 11:41:03 +02:00 |
|
Thulinma
|
e1fac6248e
|
Fix RTMP not shutting down on playback.
|
2016-07-21 11:39:31 +02:00 |
|
Thulinma
|
bd6ad88f76
|
Merge branch 'development' into LTS_development
|
2016-07-07 22:31:23 +02:00 |
|
Thulinma
|
c78cbc22ea
|
Fixed real-time playback of VoD streams that do not start at a zero timestamp
|
2016-07-07 22:31:11 +02:00 |
|
Thulinma
|
6c466d452a
|
Removed deprecated startpos option.
|
2016-06-27 13:17:15 +02:00 |
|
Thulinma
|
2af2b279d6
|
Merge branch 'development' into LTS_development
|
2016-06-19 14:12:11 +02:00 |
|
Thulinma
|
e9364d8d78
|
Nulling dispacket on page load failures to prevent segmentation faults.
|
2016-06-19 14:12:03 +02:00 |
|
Thulinma
|
83306e0ee1
|
Merge branch 'development' into LTS_development
|
2016-06-17 11:26:04 +02:00 |
|
Thulinma
|
cf477ea401
|
Fixed memory corruption bug in Output::seek()
|
2016-06-17 11:25:56 +02:00 |
|
Thulinma
|
e4de779846
|
Merge branch 'development' into LTS_development
|
2016-06-10 14:25:22 +02:00 |
|