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

Finally fixed long standing RTMP sync issue. Also added support for getting/setting FLV tag offsets.

Browse source
This commit is contained in:
Thulinma 2013-11-14 12:24:11 +01:00
parent 01d008a56c
commit b78e9bc562
3 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/flv_tag.cpp
View file

@ -262,6 +262,25 @@ std::string FLV::Tag::tagType(){
return R.str();
} //FLV::Tag::tagtype
/// Returns the 24-bit offset of this tag.
/// Returns 0 if the tag isn't H264
int FLV::Tag::offset(){
if (data[11] & 0x0F == 7){
return (((data[13] << 16) + (data[14] << 8) + data[15]) << 8) >> 8;
}else{
return 0;
}
} //offset getter
/// Sets the 24-bit offset of this tag.
/// Ignored if the tag isn't H264
void FLV::Tag::offset(int o){
if (data[11] & 0x0F != 7){return;}
data[13] = (o >> 16) & 0xFF;
data[14] = (o >> 8) & 0XFF;
data[15] = o & 0xFF;
} //offset setter
/// Returns the 32-bit timestamp of this tag.
unsigned int FLV::Tag::tagTime(){
return (data[4] << 16) + (data[5] << 8) + data[6] + (data[7] << 24);
@ -401,10 +420,7 @@ bool FLV::Tag::DTSCLoader(DTSC::Stream & S){
}else{
data[12] = 2;
}
int offset = S.getPacket()["offset"].asInt();
data[13] = (offset >> 16) & 0xFF;
data[14] = (offset >> 8) & 0XFF;
data[15] = offset & 0xFF;
offset(S.getPacket()["offset"].asInt());
}
data[11] = 0;
if (track.isMember("codec") && track["codec"].asStringRef() == "H264"){
@ -1174,9 +1190,7 @@ JSON::Value FLV::Tag::toJSON(JSON::Value & metadata){
pack_out["nalu_end"] = 1;
break;
}
int offset = (data[13] << 16) + (data[14] << 8) + data[15];
offset = (offset << 8) >> 8;
pack_out["offset"] = offset;
pack_out["offset"] = offset();
if (len < 21){
return JSON::Value();
}