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

Fixed RTMP timestamp usage.

Browse source
This commit is contained in:
Thulinma 2013-06-18 14:18:57 +02:00
parent 10dc56c338
commit 54154871ba
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/rtmpchunks.cpp
View file

@ -391,7 +391,7 @@ RTMPStream::Chunk::Chunk(){
std::string & RTMPStream::SendChunk(unsigned int cs_id, unsigned char msg_type_id, unsigned int msg_stream_id, std::string data){ std::string & RTMPStream::SendChunk(unsigned int cs_id, unsigned char msg_type_id, unsigned int msg_stream_id, std::string data){
static RTMPStream::Chunk ch; static RTMPStream::Chunk ch;
ch.cs_id = cs_id; ch.cs_id = cs_id;
ch.timestamp = Util::epoch(); ch.timestamp = Util::getMS();
ch.len = data.size(); ch.len = data.size();
ch.real_len = data.size(); ch.real_len = data.size();
ch.len_left = 0; ch.len_left = 0;
@ -438,7 +438,7 @@ std::string & RTMPStream::SendMedia(FLV::Tag & tag){
std::string & RTMPStream::SendCTL(unsigned char type, unsigned int data){ std::string & RTMPStream::SendCTL(unsigned char type, unsigned int data){
static RTMPStream::Chunk ch; static RTMPStream::Chunk ch;
ch.cs_id = 2; ch.cs_id = 2;
ch.timestamp = Util::epoch(); ch.timestamp = Util::getMS();
ch.len = 4; ch.len = 4;
ch.real_len = 4; ch.real_len = 4;
ch.len_left = 0; ch.len_left = 0;
@ -453,7 +453,7 @@ std::string & RTMPStream::SendCTL(unsigned char type, unsigned int data){
std::string & RTMPStream::SendCTL(unsigned char type, unsigned int data, unsigned char data2){ std::string & RTMPStream::SendCTL(unsigned char type, unsigned int data, unsigned char data2){
static RTMPStream::Chunk ch; static RTMPStream::Chunk ch;
ch.cs_id = 2; ch.cs_id = 2;
ch.timestamp = Util::epoch(); ch.timestamp = Util::getMS();
ch.len = 5; ch.len = 5;
ch.real_len = 5; ch.real_len = 5;
ch.len_left = 0; ch.len_left = 0;
@ -469,7 +469,7 @@ std::string & RTMPStream::SendCTL(unsigned char type, unsigned int data, unsigne
std::string & RTMPStream::SendUSR(unsigned char type, unsigned int data){ std::string & RTMPStream::SendUSR(unsigned char type, unsigned int data){
static RTMPStream::Chunk ch; static RTMPStream::Chunk ch;
ch.cs_id = 2; ch.cs_id = 2;
ch.timestamp = Util::epoch(); ch.timestamp = Util::getMS();
ch.len = 6; ch.len = 6;
ch.real_len = 6; ch.real_len = 6;
ch.len_left = 0; ch.len_left = 0;
@ -486,7 +486,7 @@ std::string & RTMPStream::SendUSR(unsigned char type, unsigned int data){
std::string & RTMPStream::SendUSR(unsigned char type, unsigned int data, unsigned int data2){ std::string & RTMPStream::SendUSR(unsigned char type, unsigned int data, unsigned int data2){
static RTMPStream::Chunk ch; static RTMPStream::Chunk ch;
ch.cs_id = 2; ch.cs_id = 2;
ch.timestamp = Util::epoch(); ch.timestamp = Util::getMS();
ch.len = 10; ch.len = 10;
ch.real_len = 10; ch.real_len = 10;
ch.len_left = 0; ch.len_left = 0;