hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Repeat previous fixes for Socket::Buffer-backed RTMP streams.

Browse source
This commit is contained in:
Thulinma 2014-08-05 14:25:14 +02:00
parent d98f14fa04
commit 7d015a32d3
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/rtmpchunks.cpp
View file

@ -697,6 +697,7 @@ bool RTMPStream::Chunk::Parse(Socket::Buffer & buffer) {
timestamp = indata[i++ ] * 256 * 256; timestamp = indata[i++ ] * 256 * 256;
timestamp += indata[i++ ] * 256; timestamp += indata[i++ ] * 256;
timestamp += indata[i++ ]; timestamp += indata[i++ ];
ts_delta = timestamp;
len = indata[i++ ] * 256 * 256; len = indata[i++ ] * 256 * 256;
len += indata[i++ ] * 256; len += indata[i++ ] * 256;
len += indata[i++ ]; len += indata[i++ ];
@ -719,7 +720,8 @@ bool RTMPStream::Chunk::Parse(Socket::Buffer & buffer) {
timestamp += indata[i++ ] * 256; timestamp += indata[i++ ] * 256;
timestamp += indata[i++ ]; timestamp += indata[i++ ];
if (timestamp != 0x00ffffff) { if (timestamp != 0x00ffffff) {
timestamp += prev.timestamp; ts_delta = timestamp;
timestamp = prev.timestamp + ts_delta;
} }
len = indata[i++ ] * 256 * 256; len = indata[i++ ] * 256 * 256;
len += indata[i++ ] * 256; len += indata[i++ ] * 256;
@ -740,7 +742,8 @@ bool RTMPStream::Chunk::Parse(Socket::Buffer & buffer) {
timestamp += indata[i++ ] * 256; timestamp += indata[i++ ] * 256;
timestamp += indata[i++ ]; timestamp += indata[i++ ];
if (timestamp != 0x00ffffff) { if (timestamp != 0x00ffffff) {
timestamp += prev.timestamp; ts_delta = timestamp;
timestamp = prev.timestamp + ts_delta;
} }
len = prev.len; len = prev.len;
len_left = prev.len_left; len_left = prev.len_left;
@ -751,9 +754,13 @@ bool RTMPStream::Chunk::Parse(Socket::Buffer & buffer) {
if (prev.msg_type_id == 0) { if (prev.msg_type_id == 0) {
DEBUG_MSG(DLVL_WARN, "Warning: Header type 0xC0 with no valid previous chunk!"); DEBUG_MSG(DLVL_WARN, "Warning: Header type 0xC0 with no valid previous chunk!");
} }
timestamp = prev.timestamp; timestamp = prev.timestamp + prev.ts_delta;
ts_delta = prev.ts_delta;
len = prev.len; len = prev.len;
len_left = prev.len_left; len_left = prev.len_left;
if (len_left > 0){
timestamp = prev.timestamp;
}
msg_type_id = prev.msg_type_id; msg_type_id = prev.msg_type_id;
msg_stream_id = prev.msg_stream_id; msg_stream_id = prev.msg_stream_id;
break; break;
@ -779,6 +786,7 @@ bool RTMPStream::Chunk::Parse(Socket::Buffer & buffer) {
timestamp += indata[i++ ] * 256 * 256; timestamp += indata[i++ ] * 256 * 256;
timestamp += indata[i++ ] * 256; timestamp += indata[i++ ] * 256;
timestamp += indata[i++ ]; timestamp += indata[i++ ];
ts_delta = timestamp;
} }
//read data if length > 0, and allocate it //read data if length > 0, and allocate it