Non DCTSIZE multiple width support for JPEG YUV decoding

Source/platform/graphics/ImageFrameGenerator.cpp

 /*
  * Copyright (C) 2012 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 115 matching lines @@
     ASSERT(bitmap.height() == scaledSize.height());
 
     bool result = true;
     // Check to see if decoder has written directly to the memory provided
     // by Skia. If not make a copy.
     if (bitmap.getPixels() != pixels)
         result = bitmap.copyPixelsTo(pixels, rowBytes * info.fHeight, rowBytes);
     return result;
 }
 
-bool ImageFrameGenerator::decodeToYUV(void* planes[3], size_t rowBytes[3])
+bool ImageFrameGenerator::decodeToYUV(SkISize componentSizes[3], void* planes[3], size_t rowBytes[3])
 {
     // This method is called to populate a discardable memory owned by Skia.
 
     // Prevents concurrent decode or scale operations on the same image data.
     MutexLocker lock(m_decodeMutex);
 
     if (m_decodeFailedAndEmpty)
         return false;
 
     TRACE_EVENT2("blink", "ImageFrameGenerator::decodeToYUV", "generator", this, "decodeCount", static_cast<int>(m_decodeCount));
@@ skipping 11 matching lines @@
     ASSERT(allDataReceived);
 
     OwnPtr<ImageDecoder> decoder = ImageDecoder::create(*data, ImageSource::AlphaPremultiplied, ImageSource::GammaAndColorProfileApplied);
     if (!decoder)
         return false;
 
     decoder->setData(data, allDataReceived);
 
     OwnPtr<ImagePlanes> imagePlanes = adoptPtr(new ImagePlanes(planes, rowBytes));
     decoder->setImagePlanes(imagePlanes.release());
+    if (decoder->isSizeAvailable())

[Noel Gordon, 2014/09/08 16:13:32]

ASSERT this?

[sugoi1, 2014/09/09 15:08:15]

isSizeAvailable() has to actually get called, because this makes sure that the
jpeg's header is read and that the size will be properly updated. I could write
something like:

bool sizeIsAvailable = decoder->isSizeAvailable();
ASSERT(sizeIsAvailable);
if (sizeIsAvailable)
    getYUVComponentSizes(...);

+        getYUVComponentSizes(decoder.get(), componentSizes, false); // Update component sizes with real size
     bool yuvDecoded = decoder->decodeToYUV();
     if (yuvDecoded)
         setHasAlpha(0, false); // YUV is always opaque
     return yuvDecoded;
 }
 
 SkBitmap ImageFrameGenerator::tryToResumeDecode(const SkISize& scaledSize, size_t index)
 {
     TRACE_EVENT1("blink", "ImageFrameGenerator::tryToResumeDecodeAndScale", "index", static_cast<int>(index));
 
@@ skipping 134 matching lines @@
     // Setting a dummy ImagePlanes object signals to the decoder that we want to do YUV decoding.
     decoder->setData(data, allDataReceived);
     OwnPtr<ImagePlanes> dummyImagePlanes = adoptPtr(new ImagePlanes);
     decoder->setImagePlanes(dummyImagePlanes.release());
 
     // canDecodeToYUV() has to be called AFTER isSizeAvailable(),
     // otherwise the output color space may not be set in the decoder.
     if (!decoder->isSizeAvailable() || !decoder->canDecodeToYUV())
         return false;
 
-    IntSize size = decoder->decodedYUVSize(0);
-    componentSizes[0].set(size.width(), size.height());
-    size = decoder->decodedYUVSize(1);
-    componentSizes[1].set(size.width(), size.height());
-    size = decoder->decodedYUVSize(2);
-    componentSizes[2].set(size.width(), size.height());
+    getYUVComponentSizes(decoder.get(), componentSizes, true);
     return true;
 }
 
+void ImageFrameGenerator::getYUVComponentSizes(const ImageDecoder* decoder, SkISize componentSizes[3], bool memoryAllocation)
+{
+    IntSize size = decoder->decodedYUVSize(0, memoryAllocation);
+    componentSizes[0].set(size.width(), size.height());
+    size = decoder->decodedYUVSize(1, memoryAllocation);
+    componentSizes[1].set(size.width(), size.height());
+    size = decoder->decodedYUVSize(2, memoryAllocation);
+    componentSizes[2].set(size.width(), size.height());
+}
+
 } // namespace blink