Backed out changeset 9b5b04d1a15a (bug 1313518) for failing gl tests test_conformance__textures__misc__texture-npot-video.html and test_2_conformance__textures__video__tex-2d-rgb-rgb-unsigned_byte.html, and dom/media/test/test_bug879717.html. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 31 Oct 2016 10:18:56 +0100
changeset 320271 15bfa2b75e1b
parent 320270 a24793dce64c
child 320272 8c9eed5227f8
push id20754
push usercbook@mozilla.com
push date2016-10-31 15:58 +0000
treeherderfx-team@b1b66b1780c2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1313518, 879717
milestone52.0a1
backs out9b5b04d1a15a
Backed out changeset 9b5b04d1a15a (bug 1313518) for failing gl tests test_conformance__textures__misc__texture-npot-video.html and test_2_conformance__textures__video__tex-2d-rgb-rgb-unsigned_byte.html, and dom/media/test/test_bug879717.html. r=backout
gfx/layers/MacIOSurfaceHelpers.cpp
--- a/gfx/layers/MacIOSurfaceHelpers.cpp
+++ b/gfx/layers/MacIOSurfaceHelpers.cpp
@@ -84,17 +84,17 @@ CreateSourceSurfaceFromLockedMacIOSurfac
     data.mPicSize = data.mYSize;
 
     ConvertYCbCrToRGB(data, SurfaceFormat::B8G8R8X8, IntSize::Truncate(ioWidth, ioHeight), mappedSurface.mData, mappedSurface.mStride);
   } else if (ioFormat == SurfaceFormat::YUV422) {
     IntSize size = IntSize::Truncate(ioWidth, ioHeight);
     libyuv::ConvertToARGB((uint8_t*)aSurface->GetBaseAddress(), 0 /* not used */,
                           mappedSurface.mData, mappedSurface.mStride,
                           0, 0,
-                          ALIGNED_32(size.width), size.height,
+                          size.width, size.height,
                           size.width, size.height,
                           libyuv::kRotate0, libyuv::FOURCC_UYVY);
   } else {
     unsigned char* ioData = (unsigned char*)aSurface->GetBaseAddress();
 
     for (size_t i = 0; i < ioHeight; ++i) {
       memcpy(mappedSurface.mData + i * mappedSurface.mStride,
              ioData + i * bytesPerRow,