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

SDP fix?

Browse source
This commit is contained in:
Thulinma 2021-02-02 16:13:12 +01:00
parent 4080d141f8
commit 4a3204cb1e
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/sdp_media.cpp
View file

@ -1079,21 +1079,34 @@ namespace SDP{
// and provides both formats in their SDP. It may happen that // and provides both formats in their SDP. It may happen that
// an SDP contains multiple format-specs for H264 // an SDP contains multiple format-specs for H264
SDP::MediaFormat *format = NULL; SDP::MediaFormat *format = NULL;
SDP::MediaFormat *backupFormat = NULL;
for (size_t i = 0; i < codecs.size(); ++i){ for (size_t i = 0; i < codecs.size(); ++i){
std::string codec = codecMist2RTP(codecs[i]); std::string codec = codecMist2RTP(codecs[i]);
std::vector<SDP::MediaFormat *> formats = media->getFormatsForEncodingName(codec); std::vector<SDP::MediaFormat *> formats = media->getFormatsForEncodingName(codec);
for (size_t j = 0; j < formats.size(); ++j){ for (size_t j = 0; j < formats.size(); ++j){
if (codec == "H264"){ if (codec == "H264"){
if (formats[j]->getPacketizationModeForH264() != 1){ if (formats[j]->getPacketizationModeForH264() != 1){
MEDIUM_MSG( MEDIUM_MSG("Skipping this H264 format because it uses a packetization mode we don't support.");
"Skipping this H264 format because it uses a packetization mode we don't support.");
format = NULL;
continue; continue;
} }
if (formats[j]->getProfileLevelIdForH264() != "42e01f"){ if (formats[j]->getProfileLevelIdForH264() != "42e01f"){
MEDIUM_MSG( MEDIUM_MSG("Skipping this H264 format because it uses an unsupported profile-level-id.");
"Skipping this H264 format because it uses an unsupported profile-level-id."); //Store the best match so far, though - just in case we never find a proper match
format = NULL; if (!backupFormat){
backupFormat = formats[j];
}else{
std::string ideal = "42e01f";
std::string oProf = backupFormat->getProfileLevelIdForH264();
std::string nProf = formats[j]->getProfileLevelIdForH264();
size_t oScore = 0, nScore = 0;
for (size_t k = 0; k < 6 && k < oProf.size(); ++k){
if (oProf[k] == ideal[k]){++oScore;}else{break;}
}
for (size_t k = 0; k < 6 && k < nProf.size(); ++k){
if (nProf[k] == ideal[k]){++nScore;}else{break;}
}
if (nScore > oScore){backupFormat = formats[j];}
}
continue; continue;
} }
} }
@ -1103,6 +1116,10 @@ namespace SDP{
if (format){break;} if (format){break;}
} }
if (!format){
format = backupFormat;
INFO_MSG("Picking non-perfect match for codec string");
}
if (!format){ if (!format){
FAIL_MSG("Cannot enable %s; codec not found %s.", type.c_str(), codecList.c_str()); FAIL_MSG("Cannot enable %s; codec not found %s.", type.c_str(), codecList.c_str());
return false; return false;