Modify YUV codecs to match Skia's API change

third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.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
@@ skipping 57 matching lines @@
         return false;
     }
 
     PlatformInstrumentation::willDecodeLazyPixelRef(m_generationId);
     bool decoded = m_frameGenerator->decodeAndScale(m_frameIndex, getInfo(), pixels, rowBytes);
     PlatformInstrumentation::didDecodeLazyPixelRef();
 
     return decoded;
 }
 
-bool DecodingImageGenerator::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3], SkYUVColorSpace* colorSpace)
+bool DecodingImageGenerator::onQueryYUV8(SkYUVSizeInfo* sizeInfo, SkYUVColorSpace* colorSpace) const
 {
     if (!m_canYUVDecode)
         return false;
 
-    bool requestingYUVSizes = !planes || !planes[0];
-
-    TRACE_EVENT1("blink", "DecodingImageGenerator::getYUV8Planes", requestingYUVSizes ? "sizes" : "frame index", static_cast<int>(m_frameIndex));
-
-    if (requestingYUVSizes)
-        return m_frameGenerator->getYUVComponentSizes(sizes);
+    TRACE_EVENT1("blink", "DecodingImageGenerator::getYUV8Planes", "sizes", static_cast<int>(m_frameIndex));

[Noel Gordon, 2016/03/01 02:27:48]

DecodingImageGenerator::getYUV8Planes -> DecodingImageGenerator::queryYUV8 here?

[msarett, 2016/03/01 18:00:37]

Yes nice catch!

 
     if (colorSpace)
         *colorSpace = kJPEG_SkYUVColorSpace;
 
+    return m_frameGenerator->getYUVComponentSizes(sizeInfo);
+}
+
+bool DecodingImageGenerator::onGetYUV8Planes(const SkYUVSizeInfo& sizeInfo, void* planes[3])
+{
+    ASSERT(m_canYUVDecode);
+
+    TRACE_EVENT1("blink", "DecodingImageGenerator::getYUV8Planes", "frame index", static_cast<int>(m_frameIndex));
+
     PlatformInstrumentation::willDecodeLazyPixelRef(m_generationId);
-    bool decoded = m_frameGenerator->decodeToYUV(m_frameIndex, sizes, planes, rowBytes);
+    bool decoded = m_frameGenerator->decodeToYUV(m_frameIndex, sizeInfo.fSizes, planes, sizeInfo.fWidthBytes);
     PlatformInstrumentation::didDecodeLazyPixelRef();
 
     return decoded;
 }
 
 SkImageGenerator* DecodingImageGenerator::create(SkData* data)
 {
     RefPtr<SharedBuffer> buffer = SharedBuffer::create(data->bytes(), data->size());
 
     // We just need the size of the image, so we have to temporarily create an ImageDecoder. Since
@@ skipping 10 matching lines @@
     const SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height());
 
     RefPtr<ImageFrameGenerator> frame = ImageFrameGenerator::create(SkISize::Make(size.width(), size.height()), buffer, true, false);
     if (!frame)
         return 0;
 
     return new DecodingImageGenerator(frame, info, 0);
 }
 
 } // namespace blink