Backed out changeset e87724022bc1 (bug 1043558) a=ryanvm (feature bustage)
authorRandell Jesup <rjesup@jesup.org>
Thu, 18 Sep 2014 00:21:43 -0400
changeset 205927 426497473505bccdad6e3b55c7cc464cc0d06ce6
parent 205926 488d490da74296fa5d1f9c276215135daf5b2a24
child 205951 d6f78faaefcc1dddf3a3f0e484bfa7dcb5997501
child 205997 0a532d73086d11088c749757653bd7daee1f7f92
push id27508
push userrjesup@wgate.com
push dateThu, 18 Sep 2014 04:22:05 +0000
treeherdermozilla-central@426497473505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersryanvm
bugs1043558
milestone35.0a1
backs oute87724022bc12d584f5e1a106c23272911da7de5
first release with
nightly linux32
426497473505 / 35.0a1 / 20140918030202 / files
nightly linux64
426497473505 / 35.0a1 / 20140918030202 / files
nightly mac
426497473505 / 35.0a1 / 20140918030202 / files
nightly win32
426497473505 / 35.0a1 / 20140918030202 / files
nightly win64
426497473505 / 35.0a1 / 20140918030202 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e87724022bc1 (bug 1043558) a=ryanvm (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;