Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h

Issue 1403393004: JPEGImageDecoder RGB565 and downsample support and related Skia imagegenerator changes Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Continued decoding fix and downscale combined Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 // Creates a new SharedBuffer containing the data received so far. 78 // Creates a new SharedBuffer containing the data received so far.
79 void copyData(RefPtr<SharedBuffer>*, bool* allDataReceived); 79 void copyData(RefPtr<SharedBuffer>*, bool* allDataReceived);
80 80
81 SkISize getFullSize() const { return m_fullSize; } 81 SkISize getFullSize() const { return m_fullSize; }
82 82
83 bool isMultiFrame() const { return m_isMultiFrame; } 83 bool isMultiFrame() const { return m_isMultiFrame; }
84 84
85 // FIXME: Return alpha state for each frame. 85 // FIXME: Return alpha state for each frame.
86 bool hasAlpha(size_t); 86 bool hasAlpha(size_t);
87 87
88 // for single frame, get information if decoder can produce color output
89 // and how close to specified scale.
90 void getAvailableDecodeAndScale(SkColorType* outType, float* scale, float* l owerScale);
91
88 bool getYUVComponentSizes(SkISize componentSizes[3]); 92 bool getYUVComponentSizes(SkISize componentSizes[3]);
89 93
90 private: 94 private:
91 class ExternalMemoryAllocator; 95 class ExternalMemoryAllocator;
92 friend class ImageFrameGeneratorTest; 96 friend class ImageFrameGeneratorTest;
93 friend class DeferredImageDecoderTest; 97 friend class DeferredImageDecoderTest;
94 // For testing. |factory| will overwrite the default ImageDecoder creation l ogic if |factory->create()| returns non-zero. 98 // For testing. |factory| will overwrite the default ImageDecoder creation l ogic if |factory->create()| returns non-zero.
95 void setImageDecoderFactory(PassOwnPtr<ImageDecoderFactory> factory) { m_ima geDecoderFactory = factory; } 99 void setImageDecoderFactory(PassOwnPtr<ImageDecoderFactory> factory) { m_ima geDecoderFactory = factory; }
96 100
97 void setHasAlpha(size_t index, bool hasAlpha); 101 void setHasAlpha(size_t index, bool hasAlpha);
98 102
99 // These methods are called while m_decodeMutex is locked. 103 // These methods are called while m_decodeMutex is locked.
100 SkBitmap tryToResumeDecode(const SkISize& scaledSize, size_t index); 104 SkBitmap tryToResumeDecode(const SkISize& scaledSize, size_t index, SkColorT ype outputType, size_t rowBytes);
101 105
102 // Use the given decoder to decode. If a decoder is not given then try to cr eate one. 106 // Use the given decoder to decode. If a decoder is not given then try to cr eate one.
103 // Returns true if decoding was complete. 107 // Returns true if decoding was complete.
104 bool decode(size_t index, ImageDecoder**, SkBitmap*); 108 bool decode(size_t index, ImageDecoder**, SkBitmap*, SkColorType outputType, const SkISize& scaledSize, size_t rowBytes);
105 109
106 SkISize m_fullSize; 110 SkISize m_fullSize;
107 ThreadSafeDataTransport m_data; 111 ThreadSafeDataTransport m_data;
108 bool m_isMultiFrame; 112 bool m_isMultiFrame;
109 bool m_decodeFailedAndEmpty; 113 bool m_decodeFailedAndEmpty;
110 Vector<bool> m_hasAlpha; 114 Vector<bool> m_hasAlpha;
111 int m_decodeCount; 115 int m_decodeCount;
112 Vector<bool> m_frameComplete; 116 Vector<bool> m_frameComplete;
113 size_t m_frameCount; 117 size_t m_frameCount;
114 OwnPtr<ExternalMemoryAllocator> m_externalAllocator; 118 OwnPtr<ExternalMemoryAllocator> m_externalAllocator;
115 119
116 OwnPtr<ImageDecoderFactory> m_imageDecoderFactory; 120 OwnPtr<ImageDecoderFactory> m_imageDecoderFactory;
117 121
118 // Prevents multiple decode operations on the same data. 122 // Prevents multiple decode operations on the same data.
119 Mutex m_decodeMutex; 123 Mutex m_decodeMutex;
120 124
121 // Protect concurrent access to m_hasAlpha. 125 // Protect concurrent access to m_hasAlpha.
122 Mutex m_alphaMutex; 126 Mutex m_alphaMutex;
123 }; 127 };
124 128
125 } // namespace blink 129 } // namespace blink
126 130
127 #endif 131 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698