Modify YUV codecs to match Skia's API change

third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 
 #include "platform/image-decoders/jpeg/JPEGImageDecoder.h"
 
 #include "platform/SharedBuffer.h"
 #include "platform/image-decoders/ImageAnimation.h"
 #include "platform/image-decoders/ImageDecoderTestHelpers.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebSize.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "wtf/ArrayBuffer.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 static const size_t LargeEnoughSize = 1000 * 1000;
 
 namespace {
 
 PassOwnPtr<ImageDecoder> createDecoder(size_t maxDecodedBytes)
@@ skipping 24 matching lines @@
 }
 
 void readYUV(size_t maxDecodedBytes, unsigned* outputYWidth, unsigned* outputYHeight, unsigned* outputUVWidth, unsigned* outputUVHeight, const char* imageFilePath)
 {
     RefPtr<SharedBuffer> data = readFile(imageFilePath);
     ASSERT_TRUE(data);
 
     OwnPtr<ImageDecoder> decoder = createDecoder(maxDecodedBytes);
     decoder->setData(data.get(), true);
 
-    OwnPtr<ImagePlanes> imagePlanes = adoptPtr(new ImagePlanes());
-    decoder->setImagePlanes(imagePlanes.release());
+    // Setting a dummy ImagePlanes object signals to the decoder that we want to do YUV decoding.
+    OwnPtr<ImagePlanes> dummyImagePlanes = adoptPtr(new ImagePlanes());
+    decoder->setImagePlanes(dummyImagePlanes.release());
+
     bool sizeIsAvailable = decoder->isSizeAvailable();
     ASSERT_TRUE(sizeIsAvailable);
 
     IntSize size = decoder->decodedSize();
-    IntSize ySize = decoder->decodedYUVSize(0, ImageDecoder::ActualSize);
-    IntSize uSize = decoder->decodedYUVSize(1, ImageDecoder::ActualSize);
-    IntSize vSize = decoder->decodedYUVSize(2, ImageDecoder::ActualSize);
+    IntSize ySize = decoder->decodedYUVSize(0);
+    IntSize uSize = decoder->decodedYUVSize(1);
+    IntSize vSize = decoder->decodedYUVSize(2);
 
     ASSERT_TRUE(size.width() == ySize.width());
     ASSERT_TRUE(size.height() == ySize.height());
     ASSERT_TRUE(uSize.width() == vSize.width());
     ASSERT_TRUE(uSize.height() == vSize.height());
 
     *outputYWidth = ySize.width();
     *outputYHeight = ySize.height();
     *outputUVWidth = uSize.width();
     *outputUVHeight = uSize.height();
+
+    size_t rowBytes[3];
+    rowBytes[0] = decoder->decodedYUVWidthBytes(0);
+    rowBytes[1] = decoder->decodedYUVWidthBytes(1);
+    rowBytes[2] = decoder->decodedYUVWidthBytes(2);
+
+    RefPtr<ArrayBuffer> buffer(ArrayBuffer::create(rowBytes[0] * ySize.height() + rowBytes[1] * uSize.height() + rowBytes[2] * vSize.height(), 1));
+    void* planes[3];
+    planes[0] = buffer->data();
+    planes[1] = ((char*) planes[0]) + rowBytes[0] * ySize.height();
+    planes[2] = ((char*) planes[1]) + rowBytes[1] * uSize.height();
+    OwnPtr<ImagePlanes> imagePlanes = adoptPtr(new ImagePlanes(planes, rowBytes));

[Noel Gordon, 2016/03/03 01:25:28]

Nit: space before this line.

[msarett, 2016/03/04 19:49:08]

Done.

+    decoder->setImagePlanes(imagePlanes.release());
+
+    ASSERT_TRUE(decoder->decodeToYUV());
 }
 
 // Tests failure on a too big image.
 TEST(JPEGImageDecoderTest, tooBig)
 {
     OwnPtr<ImageDecoder> decoder = createDecoder(100);
     EXPECT_FALSE(decoder->setSize(10000, 10000));
     EXPECT_TRUE(decoder->failed());
 }
 
@@ skipping 97 matching lines @@
 TEST(JPEGImageDecoderTest, yuv)
 {
     const char* jpegFile = "/LayoutTests/fast/images/resources/lenna.jpg"; // 256x256, YUV 4:2:0
     unsigned outputYWidth, outputYHeight, outputUVWidth, outputUVHeight;
     readYUV(LargeEnoughSize, &outputYWidth, &outputYHeight, &outputUVWidth, &outputUVHeight, jpegFile);
     EXPECT_EQ(256u, outputYWidth);
     EXPECT_EQ(256u, outputYHeight);
     EXPECT_EQ(128u, outputUVWidth);
     EXPECT_EQ(128u, outputUVHeight);
 
+    const char* jpegFileImageSizeNotMultipleOf8 = "/LayoutTests/fast/images/resources/cropped_mandrill.jpg"; // 439x154

[Noel Gordon, 2016/03/03 01:25:28]

Thanks for the name fix: works for me.

[msarett, 2016/03/04 19:49:08]

Acknowledged.

+    readYUV(LargeEnoughSize, &outputYWidth, &outputYHeight, &outputUVWidth, &outputUVHeight, jpegFileImageSizeNotMultipleOf8);
+    EXPECT_EQ(439u, outputYWidth);
+    EXPECT_EQ(154u, outputYHeight);
+    EXPECT_EQ(220u, outputUVWidth);
+    EXPECT_EQ(77u, outputUVHeight);
+
     // Make sure we revert to RGBA decoding when we're about to downscale,
     // which can occur on memory-constrained android devices.
     RefPtr<SharedBuffer> data = readFile(jpegFile);
     ASSERT_TRUE(data);
 
     OwnPtr<ImageDecoder> decoder = createDecoder(230 * 230 * 4);
     decoder->setData(data.get(), true);
 
     OwnPtr<ImagePlanes> imagePlanes = adoptPtr(new ImagePlanes());
     decoder->setImagePlanes(imagePlanes.release());
@@ skipping 20 matching lines @@
 // not break JPEG decoding at a critical point: in between a call to decode the
 // size (when JPEGImageDecoder stops while it may still have input data to
 // read) and a call to do a full decode.
 TEST(JPEGImageDecoderTest, mergeBuffer)
 {
     const char* jpegFile = "/LayoutTests/fast/images/resources/lenna.jpg";
     testMergeBuffer(&createDecoder, jpegFile);
 }
 
 } // namespace blink