Thulinma
|
bb7dcd8f2a
|
Merge branch 'development' into LTS_development
|
2015-09-04 10:12:45 +02:00 |
|
Thulinma
|
2222a37079
|
Improvements to track negotiation timings and debug message verbosity.
|
2015-09-04 10:12:30 +02:00 |
|
Erik Zandvliet
|
0913d2607e
|
Working PlayReady/Verimatrix DRM support
|
2015-09-02 12:09:37 +02:00 |
|
Erik Zandvliet
|
8024181e55
|
Made metadatapages larger
|
2015-06-26 18:05:42 +02:00 |
|
Erik Zandvliet
|
10d7d5fb62
|
Made metadatapages larger
|
2015-06-22 14:56:29 +02:00 |
|
Thulinma
|
9e10cc621c
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-05-21 20:17:37 +02:00 |
|
Thulinma
|
6b2a158d9c
|
Backported various fixes by Erik Zandvliet, also added better handling of re-pushes.
|
2015-05-21 20:15:09 +02:00 |
|
Erik Zandvliet
|
926dd01995
|
Fixed removing pages at the right points.
|
2015-05-20 14:45:38 +02:00 |
|
Thulinma
|
6f933bdb97
|
Fixed live pushing when more than 2 tracks present.
|
2015-05-07 12:02:49 +02:00 |
|
Thulinma
|
77dcfc23ad
|
Removed remaining recording code.
|
2015-04-28 09:39:01 +02:00 |
|
Thulinma
|
c96f0fb9e4
|
Merge branch 'development' into LTS_development
|
2015-04-21 17:14:51 +02:00 |
|
Thulinma
|
acc462c281
|
Minor edit to live buffer semaphore naming.
|
2015-04-21 17:14:13 +02:00 |
|
Thulinma
|
9b683f6ee3
|
Merge branch 'development' into LTS_development
|
2015-04-15 13:49:18 +02:00 |
|
Thulinma
|
73b1f2d75c
|
Prevented deleting live tracks too soon.
|
2015-04-15 13:49:12 +02:00 |
|
Thulinma
|
818ffbed33
|
Merge branch 'development' into LTS_development
|
2015-04-14 17:33:35 +02:00 |
|
Thulinma
|
f86476153e
|
Fixed live semaphore problems.
|
2015-04-14 17:33:30 +02:00 |
|
Thulinma
|
3489d1ee34
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-04-14 15:32:05 +02:00 |
|
Thulinma
|
69cf17d01d
|
Increased maximum simultaneous tracks from 5 to 10, made this a define option. Allow multiple pushes through a single RTMP connection.
|
2015-04-14 15:30:25 +02:00 |
|
Thulinma
|
4bdbd82f66
|
LTS Commits
|
2015-04-05 21:38:36 +02:00 |
|
Erik Zandvliet
|
d370ef4eac
|
Working multi-input
|
2015-04-02 09:56:47 +02:00 |
|
Thulinma
|
cf52b6bbcc
|
Added support for space as a stream separator character.
|
2015-03-13 01:05:01 +01:00 |
|
Thulinma
|
96328cd035
|
Changed default buffer size to 50s from 30s
|
2015-03-06 12:48:23 +01:00 |
|
Thulinma
|
109fa4d91f
|
Live streams: Added error message in case index entries run out, fixed index entries running out.
|
2015-02-09 21:44:37 +01:00 |
|
Thulinma
|
39a386ab18
|
Stability improvements for live buffers / fixed issues with file extensions in RTMP stream names.
|
2015-01-29 01:28:46 +01:00 |
|
Thulinma
|
43d35cf29b
|
Converted previously hardcoded default sizes for shared memory pages to defines.
|
2015-01-27 12:03:52 +01: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
|
85fe9d1713
|
Fixed slow input buffer shutdown.
|
2014-12-15 18:13:38 +01:00 |
|
Thulinma
|
2769e41258
|
Fixed keysizes not being properly wiped when the stream buffer is.
|
2014-12-05 21:40:36 +01:00 |
|
Thulinma
|
1f83e1d5b4
|
Fixed commit mistake.
|
2014-11-26 10:00:36 +01:00 |
|
Thulinma
|
8d4639c8c6
|
Better method for setting bufferTime.
|
2014-11-24 15:55:50 +01:00 |
|
Thulinma
|
8542281ac2
|
JSON-based input selection.
|
2014-10-02 16:12:19 +02:00 |
|
ozzay
|
aedf06d3ef
|
Live does not break after viewer disconnect
Make sure pusher is identified in output.cpp as data[4,5] = 0xFFFF
|
2014-08-22 17:04:17 +02:00 |
|
Erik Zandvliet
|
fefd0e2f6f
|
Two small fixes to repair rtmp re-pushing
|
2014-06-23 15:08:26 +02:00 |
|
Thulinma
|
5f35b5226d
|
Removed "to go" debug message to prevent spam.
|
2014-06-16 16:28:01 +02:00 |
|
Thulinma
|
4d9d5aa5b5
|
Various fixes to live pushing.
|
2014-06-16 14:23:55 +02:00 |
|
Erik Zandvliet
|
391daaaa71
|
Various fixes for live, pushing as well as output
|
2014-06-11 16:57:26 +02:00 |
|
Thulinma
|
b5745727a0
|
Silence ALL the compile warnings!
|
2014-06-08 00:19:53 +02:00 |
|
Thulinma
|
c6e86a697b
|
Various RTMP fixes.
|
2014-06-07 01:02:56 +02:00 |
|
Thulinma
|
6f5f3b37c2
|
Fixed live support
|
2014-05-13 12:00:42 +02:00 |
|
Erik Zandvliet
|
87a2f50dc9
|
Updated the buffer to reflect on non-video keyframes
|
2014-04-18 13:33:45 +02:00 |
|
Thulinma
|
5ece1d7471
|
Fixed some compile errors.
|
2014-04-05 01:03:09 +02:00 |
|
Thulinma
|
cd2fe225c5
|
Shared memory rewrite
|
2014-04-04 19:50:40 +02:00 |
|