Bug 1148572 - Improve H264 renegotiation handling. r=jesup, a=abillings
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Mon, 30 Mar 2015 20:48:28 -0700
changeset 266801 6adad6d402289163344db005d252152d7ec07343
parent 266800 9a3865593e662e76a49e586f27a91f63f9428b92
child 266802 1f5e12301c9808c5da180426dd5f18127a33410a
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, abillings
bugs1148572
milestone39.0a2
Bug 1148572 - Improve H264 renegotiation handling. r=jesup, a=abillings
media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -841,16 +841,19 @@ MediaPipelineFactory::ConfigureVideoCode
 MediaConduitErrorCode
 MediaPipelineFactory::EnsureExternalCodec(VideoSessionConduit& aConduit,
                                           VideoCodecConfig* aConfig,
                                           bool aIsSend)
 {
   if (aConfig->mName == "VP8" || aConfig->mName == "VP9") {
     return kMediaConduitNoError;
   } else if (aConfig->mName == "H264") {
+    if (aConduit.CodecPluginID() != 0) {
+      return kMediaConduitNoError;
+    }
     // Register H.264 codec.
     if (aIsSend) {
       VideoEncoder* encoder = nullptr;
 #ifdef MOZ_WEBRTC_OMX
       encoder =
           OMXVideoCodec::CreateEncoder(OMXVideoCodec::CodecType::CODEC_H264);
 #else
       encoder = GmpVideoCodec::CreateEncoder();