Packetization mode only

Author: ladvoc

webrtc-sys/src/video_decoder_factory.cpp

@@ -106,15 +106,22 @@ std::unique_ptr<webrtc::VideoDecoder> VideoDecoderFactory::Create(
     }
   }
 
-  // Platform HW decoders (VideoToolbox, MediaCodec) can decode any H.264
-  // stream regardless of packetization-mode. IsSameCodec treats different
-  // packetization-modes as distinct codecs, so when the SFU sends mode=0 but
-  // the platform factory only advertises mode=1 the strict match above fails.
-  // Retry with a relaxed name-only check before falling through to software.
+  // IsSameCodec treats H.264 packetization-modes as distinct codecs, so when
+  // the SFU sends mode=0 but the platform factory only advertises mode=1 the
+  // strict match above fails. Retry with the factory's packetization-mode so
+  // only that parameter is relaxed while the profile-level-id check is kept.
   if (absl::EqualsIgnoreCase(format.name, cricket::kH264CodecName)) {
     for (const auto& factory : factories_) {
       for (const auto& sf : factory->GetSupportedFormats()) {
-        if (absl::EqualsIgnoreCase(sf.name, cricket::kH264CodecName))
+        if (!absl::EqualsIgnoreCase(sf.name, cricket::kH264CodecName))
+          continue;
+        auto adjusted = format;
+        auto it = sf.parameters.find("packetization-mode");
+        if (it != sf.parameters.end())
+          adjusted.parameters["packetization-mode"] = it->second;
+        else
+          adjusted.parameters.erase("packetization-mode");
+        if (sf.IsSameCodec(adjusted))
           return factory->Create(env, format);
       }
     }