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

Fixed TS-based outputs injecting extra init/nalend data when not needed

Browse source
This commit is contained in:
Thulinma 2022-04-04 14:19:08 +02:00
parent 7aa105748f
commit ad85f45972
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/output/output_ts_base.cpp
View file

@ -79,26 +79,43 @@ namespace Mist{
std::string bs; std::string bs;
// prepare bufferstring // prepare bufferstring
if (video){ if (video){
bool addInit = keyframe;
bool addEndNal = true;
if (codec == "H264" || codec == "HEVC"){ if (codec == "H264" || codec == "HEVC"){
uint32_t extraSize = 0; uint32_t extraSize = 0;
// dataPointer[4] & 0x1f is used to check if this should be done later: //Check if we need to skip sending some things
// fillPacket("\000\000\000\001\011\360", 6); if (codec == "H264"){
if (codec == "H264" && (dataPointer[4] & 0x1f) != 0x09){extraSize += 6;} size_t ctr = 0;
if (keyframe){ char * ptr = dataPointer;
while (ptr+4 < dataPointer+dataLen && ++ctr <= 5){
switch (ptr[4] & 0x1f){
case 0x07://init
case 0x08://init
addInit = false;
break;
case 0x09://new nal
addEndNal = false;
break;
default: break;
}
ptr += Bit::btohl(ptr);
}
}
if (addEndNal && codec == "H264"){extraSize += 6;}
if (addInit){
if (codec == "H264"){ if (codec == "H264"){
MP4::AVCC avccbox; MP4::AVCC avccbox;
avccbox.setPayload(M.getInit(thisIdx)); avccbox.setPayload(M.getInit(thisIdx));
bs = avccbox.asAnnexB(); bs = avccbox.asAnnexB();
extraSize += bs.size(); extraSize += bs.size();
} }
/*LTS-START*/
if (codec == "HEVC"){ if (codec == "HEVC"){
MP4::HVCC hvccbox; MP4::HVCC hvccbox;
hvccbox.setPayload(M.getInit(thisIdx)); hvccbox.setPayload(M.getInit(thisIdx));
bs = hvccbox.asAnnexB(); bs = hvccbox.asAnnexB();
extraSize += bs.size(); extraSize += bs.size();
} }
/*LTS-END*/
} }
const uint32_t MAX_PES_SIZE = 65490 - 13; const uint32_t MAX_PES_SIZE = 65490 - 13;
@ -111,11 +128,13 @@ namespace Mist{
(((dataLen + extraSize) > MAX_PES_SIZE) ? 0 : dataLen + extraSize), (((dataLen + extraSize) > MAX_PES_SIZE) ? 0 : dataLen + extraSize),
packTime, offset, true, M.getBps(thisIdx)); packTime, offset, true, M.getBps(thisIdx));
fillPacket(bs.data(), bs.size(), firstPack, video, keyframe, pkgPid, contPkg); fillPacket(bs.data(), bs.size(), firstPack, video, keyframe, pkgPid, contPkg);
if (codec == "H264" && (dataPointer[4] & 0x1f) != 0x09){
// End of previous nal unit, if not already present // End of previous nal unit, if not already present
if (addEndNal && codec == "H264"){
fillPacket("\000\000\000\001\011\360", 6, firstPack, video, keyframe, pkgPid, contPkg); fillPacket("\000\000\000\001\011\360", 6, firstPack, video, keyframe, pkgPid, contPkg);
} }
if (keyframe){ // Init data, if keyframe and not already present
if (addInit){
if (codec == "H264"){ if (codec == "H264"){
MP4::AVCC avccbox; MP4::AVCC avccbox;
avccbox.setPayload(M.getInit(thisIdx)); avccbox.setPayload(M.getInit(thisIdx));