Backed out changeset e87724022bc1 (bug 1043558) (feature bustage)
authorRandell Jesup <rjesup@jesup.org>
Wed, 17 Sep 2014 23:25:03 -0400
changeset 205929 c3720dfde31362e0ceeb84673caf54e62b385898
parent 205928 72afb1152cf38e62b346cdad24ab09688be71554
child 205930 ea8952f4824737ccebf280c360d74770eef29e41
push id10736
push userrjesup@wgate.com
push dateThu, 18 Sep 2014 03:26:37 +0000
treeherderb2g-inbound@c3720dfde313 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1043558
milestone35.0a1
backs oute87724022bc12d584f5e1a106c23272911da7de5
Backed out changeset e87724022bc1 (bug 1043558) (feature bustage)
content/media/webrtc/MediaEngineWebRTCVideo.cpp
--- a/content/media/webrtc/MediaEngineWebRTCVideo.cpp
+++ b/content/media/webrtc/MediaEngineWebRTCVideo.cpp
@@ -992,22 +992,17 @@ MediaEngineWebRTCVideoSource::RotateImag
   android::sp<android::GraphicBuffer> graphicBuffer = nativeImage->GetGraphicBuffer();
   void *pMem = nullptr;
   uint32_t size = aWidth * aHeight * 3 / 2;
 
   graphicBuffer->lock(android::GraphicBuffer::USAGE_SW_READ_MASK, &pMem);
 
   uint8_t* srcPtr = static_cast<uint8_t*>(pMem);
   // Create a video frame and append it to the track.
-#ifdef MOZ_WIDGET_GONK
-  ImageFormat format = ImageFormat::GRALLOC_PLANAR_YCBCR;
-#else
-  ImageFormat format = ImageFormat::PLANAR_YCBCR;
-#endif
-  nsRefPtr<layers::Image> image = mImageContainer->CreateImage(format);
+  nsRefPtr<layers::Image> image = mImageContainer->CreateImage(ImageFormat::PLANAR_YCBCR);
   layers::PlanarYCbCrImage* videoImage = static_cast<layers::PlanarYCbCrImage*>(image.get());
 
   uint32_t dstWidth;
   uint32_t dstHeight;
 
   if (mRotation == 90 || mRotation == 270) {
     dstWidth = aHeight;
     dstHeight = aWidth;