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

Attempts at fixing timestamp issues, improved FLV/RTMP cooperatibility, fixed several bugs

Browse source
This commit is contained in:
Thulinma 2011-08-21 20:49:42 +02:00
parent dee3f65228
commit e503e9789c
5 changed files with 45 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Connector_RTMP/main.cpp
View file

@ -121,13 +121,15 @@ int Connector_RTMP::Connector_RTMP(Socket::Connection conn){
}
if (viddone && auddone && justdone){
if (viddata.len != 0){
Socket.write(RTMPStream::SendMedia((unsigned char)viddata.data[0], (unsigned char *)viddata.data+11, viddata.len-15, 0));
viddata.tagTime(RTMPStream::getNowMS());
Socket.write(RTMPStream::SendMedia(viddata));
#if DEBUG >= 8
fprintf(stderr, "Sent tag to %i: [%u] %s\n", Socket.getSocket(), viddata.tagTime(), viddata.tagType().c_str());
#endif
}
if (auddata.len != 0){
Socket.write(RTMPStream::SendMedia((unsigned char)auddata.data[0], (unsigned char *)auddata.data+11, auddata.len-15, 0));
auddata.tagTime(RTMPStream::getNowMS());
Socket.write(RTMPStream::SendMedia(auddata));
#if DEBUG >= 8
fprintf(stderr, "Sent tag to %i: [%u] %s\n", Socket.getSocket(), auddata.tagTime(), auddata.tagType().c_str());
#endif
@ -137,7 +139,7 @@ int Connector_RTMP::Connector_RTMP(Socket::Connection conn){
//not gotten init yet? cancel this tag
if (viddata.len == 0 || auddata.len == 0){break;}
//send tag normally
Socket.write(RTMPStream::SendMedia((unsigned char)tag.data[0], (unsigned char *)tag.data+11, tag.len-15, tag.tagTime()));
Socket.write(RTMPStream::SendMedia(tag));
#if DEBUG >= 8
fprintf(stderr, "Sent tag to %i: [%u] %s\n", Socket.getSocket(), tag.tagTime(), tag.tagType().c_str());
#endif