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

FLV library: improved video init data handling

Browse source
This commit is contained in:
Thulinma 2020-12-22 09:56:36 +01:00
parent 9417fa8dc2
commit 57ecca2db8
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/flv_tag.cpp
View file

@ -904,29 +904,28 @@ void FLV::Tag::toMeta(DTSC::Meta &meta, AMF::Object &amf_storage, size_t &reTrac
} }
} }
if (needsInitData() && isInitData()){ if (needsInitData() && isInitData()){
if ((videodata & 0x0F) == 7){ if ((videodata & 0x0F) == 7){//H264
if (len < 21){return;} if (len < 21){return;}
MP4::AVCC avccBox; MP4::AVCC avccBox;
avccBox.setPayload(data + 16, len - 20); avccBox.setPayload(data + 16, len - 20);
avccBox.sanitize(); avccBox.sanitize();
std::string oldInit = meta.getInit(reTrack);
meta.setInit(reTrack, avccBox.payload(), avccBox.payloadSize()); meta.setInit(reTrack, avccBox.payload(), avccBox.payloadSize());
}else{
if (len < 17){return;} //Read the metadata from the init data, because we don't trust the metadata
MP4::AVCC avccBox;
avccBox.setPayload(data + 12, len - 16);
avccBox.sanitize();
meta.setInit(reTrack, avccBox.payload(), avccBox.payloadSize());
}
/// this is a hacky way around invalid FLV data (since it gets ignored nearly everywhere, but
/// we do need correct data...
if (!meta.getWidth(reTrack) || !meta.getHeight(reTrack) || !meta.getFpks(reTrack)){
std::string init = meta.getInit(reTrack); std::string init = meta.getInit(reTrack);
if (oldInit.size() && init != oldInit){
WARN_MSG("Initialization data for video track changed! Updating stream to match, but there may be some glitches for a bit.");
}
h264::sequenceParameterSet sps; h264::sequenceParameterSet sps;
sps.fromDTSCInit(init); sps.fromDTSCInit(init);
h264::SPSMeta spsChar = sps.getCharacteristics(); h264::SPSMeta spsChar = sps.getCharacteristics();
meta.setWidth(reTrack, spsChar.width); meta.setWidth(reTrack, spsChar.width);
meta.setHeight(reTrack, spsChar.height); meta.setHeight(reTrack, spsChar.height);
meta.setFpks(reTrack, spsChar.fps * 1000); meta.setFpks(reTrack, spsChar.fps * 1000);
}else{//non-H264
if (len < 17){return;}
meta.setInit(reTrack, data+12, len-16);
} }
} }
} }