Allowing YUV data to be retrieved from the JPEG Decoder.

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 23 matching lines @@
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/ThreadSafeRefCounted.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
+class DecodingBuffers;
 class ImageDecoder;
 class ScaledImageFragment;
 class SharedBuffer;
 
 class PLATFORM_EXPORT ImageDecoderFactory {
     WTF_MAKE_NONCOPYABLE(ImageDecoderFactory);
 public:
     ImageDecoderFactory() {}
     virtual ~ImageDecoderFactory() { }
     virtual PassOwnPtr<ImageDecoder> create() = 0;
@@ skipping 12 matching lines @@
 
     const ScaledImageFragment* decodeAndScale(const SkISize& scaledSize, size_t index = 0);
 
     // Decodes and scales the specified frame indicated by |index|. Dimensions
     // and output format are specified in |info|. Decoded pixels are written
     // into |pixels| with a stride of |rowBytes|.
     //
     // Returns true if decoding was successful.
     bool decodeAndScale(const SkImageInfo&, size_t index, void* pixels, size_t rowBytes);
 
+    // Decodes components directly into the provided memory planes

[Peter Kasting, 2014/07/23 22:17:37]

Nit: Trailing period

[sugoi1, 2014/07/24 15:48:29]

Done.

+    bool decodeAndScale(void* planes[3], size_t rowBytes[3]);
+
     void setData(PassRefPtr<SharedBuffer>, bool allDataReceived);
 
     // Creates a new SharedBuffer containing the data received so far.
     void copyData(RefPtr<SharedBuffer>*, bool* allDataReceived);
 
     SkISize getFullSize() const { return m_fullSize; }
 
     bool isMultiFrame() const { return m_isMultiFrame; }
 
     // FIXME: Return alpha state for each frame.
     bool hasAlpha(size_t);
 
+    // Returns sizes for the first 3 components of an image (could be RGB, YUV, etc)
+    bool getComponentSizes(SkISize* componentSizes);

[Peter Kasting, 2014/07/23 22:17:37]

Above you pass arrays with sizes, but here you pass a pointer.  Be consistent.

[sugoi1, 2014/07/24 15:48:29]

Done. Used arrays in both cases.

+
 private:
     class ExternalMemoryAllocator;
     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 = factory; }
     // For testing.
     SkBitmap::Allocator* allocator() const { return m_discardableAllocator.get(); }
     void setAllocator(PassOwnPtr<SkBitmap::Allocator> allocator) { m_discardableAllocator = allocator; }
 
     // These methods are called while m_decodeMutex is locked.
     const ScaledImageFragment* tryToLockCompleteCache(const SkISize& scaledSize, size_t index);
     const ScaledImageFragment* tryToResumeDecode(const SkISize& scaledSize, size_t index);
 
     // Use the given decoder to decode. If a decoder is not given then try to create one.
     PassOwnPtr<ScaledImageFragment> decode(size_t index, ImageDecoder**);
 
     // Return the next generation ID of a new image object. This is used
     // to identify images of the same frame from different stages of
     // progressive decode.
     size_t nextGenerationId() { return m_decodeCount++; }
 
     SkISize m_fullSize;
     ThreadSafeDataTransport m_data;
     bool m_isMultiFrame;
     bool m_decodeFailedAndEmpty;
+    bool m_hardwareDecoding;
+    OwnPtr<DecodingBuffers> m_decodingBuffers;
     Vector<bool> m_hasAlpha;
     size_t m_decodeCount;
     OwnPtr<SkBitmap::Allocator> m_discardableAllocator;
     OwnPtr<ExternalMemoryAllocator> m_externalAllocator;
 
     OwnPtr<ImageDecoderFactory> m_imageDecoderFactory;
 
     // Prevents multiple decode operations on the same data.
     Mutex m_decodeMutex;
 
     // Protect concurrent access to m_hasAlpha.
     Mutex m_alphaMutex;
 };
 
 } // namespace blink
 
 #endif