Bug 1067437: Disable resolution changes on OMX H.264 until OMX DSP code is updated r=pkerr
authorRandell Jesup <rjesup@jesup.org>
Mon, 22 Sep 2014 14:45:00 -0400
changeset 206584 eb5bd78a635f49e34f210f6e58a6e0ece2bf12bc
parent 206583 31ff3ab5c143e064e27d5a815d7e76086965a350
child 206585 b415215720263664bf4b86f42b1f400821fce53a
push idunknown
push userunknown
push dateunknown
reviewerspkerr
bugs1067437
milestone35.0a1
Bug 1067437: Disable resolution changes on OMX H.264 until OMX DSP code is updated r=pkerr
media/webrtc/trunk/webrtc/video_engine/vie_encoder.cc
--- a/media/webrtc/trunk/webrtc/video_engine/vie_encoder.cc
+++ b/media/webrtc/trunk/webrtc/video_engine/vie_encoder.cc
@@ -700,16 +700,30 @@ void ViEEncoder::DeliverFrame(int id,
                    webrtc::kTraceVideo,
                    ViEId(engine_id_, channel_id_),
                    "%s: Error encoding frame %u", __FUNCTION__,
                    video_frame->timestamp());
     }
     return;
   }
 #endif
+#ifdef MOZ_WEBRTC_OMX
+  // XXX effectively disable resolution changes until Bug 1067437 is resolved with new DSP code
+  if (qm_callback_ && vcm_.SendCodec() == webrtc::kVideoCodecH264) {
+    if (vcm_.RegisterVideoQMCallback(NULL) != 0) {
+      WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideo,
+                   ViEId(engine_id_, channel_id_),
+                   "VCM::RegisterQMCallback(NULL) failure");
+      return;
+    }
+    delete qm_callback_;
+    qm_callback_ = NULL;
+  }
+#endif
+
   if (vcm_.AddVideoFrame(*decimated_frame,
                          vpm_.ContentMetrics()) != VCM_OK) {
     WEBRTC_TRACE(webrtc::kTraceError,
                  webrtc::kTraceVideo,
                  ViEId(engine_id_, channel_id_),
                  "%s: Error encoding frame %u", __FUNCTION__,
                  video_frame->timestamp());
   }