Modify YUV codecs to match Skia's API change

third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h

 /*
  * 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 13 matching lines @@
  */
 
 #ifndef ImageFrameGenerator_h
 #define ImageFrameGenerator_h
 
 #include "platform/PlatformExport.h"
 #include "platform/graphics/ThreadSafeDataTransport.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkTypes.h"
+#include "third_party/skia/include/core/SkYUVSizeInfo.h"
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/ThreadSafeRefCounted.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
 
@@ skipping 29 matching lines @@
     // according to the contract SkImageGenerator::refEncodedData. Returns null if
     // the data is has not been fully received.
     SkData* refEncodedData();
 
     // Decodes and scales the specified frame at |index|. The dimensions and output
     // format are given in SkImageInfo. Decoded pixels are written into |pixels| with
     // a stride of |rowBytes|. Returns true if decoding was successful.
     bool decodeAndScale(size_t index, const SkImageInfo&, void* pixels, size_t rowBytes);
 
     // Decodes YUV components directly into the provided memory planes.
-    bool decodeToYUV(size_t index, SkISize componentSizes[3], void* planes[3], size_t rowBytes[3]);
+    bool decodeToYUV(size_t index, const SkISize componentSizes[3], void* planes[3], const size_t rowBytes[3]);

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

Not really to do with your CL, but would it make sense to move to planes to the
end of the argument list (since it is really the "out" parameter)?

bool decodeToYUV(size_t index, const SkISize componentSizes[3], const size_t
rowBytes[3], void* planes[3]);

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

I don't disagree with you...

But on the other hand, (Size, Memory, RowBytes) is a common pattern in Skia
(though I realize this isn't Skia).

If you don't mind, I'll leave as is in this CL.

 
     const SkISize& getFullSize() const { return m_fullSize; }
 
     bool isMultiFrame() const { return m_isMultiFrame; }
     bool decodeFailed() const { return m_decodeFailed; }
 
     bool hasAlpha(size_t index);
 
-    bool getYUVComponentSizes(SkISize componentSizes[3]);
+    bool getYUVComponentSizes(SkYUVSizeInfo*);
 
 private:
     ImageFrameGenerator(const SkISize& fullSize, PassRefPtr<SharedBuffer>, bool allDataReceived, bool isMultiFrame);
 
     friend class ImageFrameGeneratorTest;
     friend class DeferredImageDecoderTest;
     // For testing. |factory| will overwrite the default ImageDecoder creation logic if |factory->create()| returns non-zero.
     void setImageDecoderFactory(PassOwnPtr<ImageDecoderFactory> factory) { m_imageDecoderFactory = std::move(factory); }
 
     void setHasAlpha(size_t index, bool hasAlpha);
@@ skipping 29 matching lines @@
     SkData* m_encodedData;
 
 #if COMPILER(MSVC)
     friend struct ::WTF::OwnedPtrDeleter<ExternalMemoryAllocator>;
 #endif
 };
 
 } // namespace blink
 
 #endif