Bug 1148572 - Improve H264 renegotiation handling. r=jesup, a=sledru
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Mon, 30 Mar 2015 20:48:28 -0700
changeset 258249 8d84399a000b
parent 258248 5f5a4c5a7e02
child 258250 d6ec30c02b8d
push id4628
push userryanvm@gmail.com
push date2015-04-03 20:32 +0000
treeherdermozilla-beta@e4566e5991e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, sledru
bugs1148572
milestone38.0
Bug 1148572 - Improve H264 renegotiation handling. r=jesup, a=sledru
media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -780,16 +780,19 @@ MediaPipelineFactory::GetOrCreateVideoCo
 MediaConduitErrorCode
 MediaPipelineFactory::EnsureExternalCodec(VideoSessionConduit& aConduit,
                                           VideoCodecConfig* aConfig,
                                           bool aIsSend)
 {
   if (aConfig->mName == "VP8") {
     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();