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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.h

Issue 2565323003: Move gif image decoder to SkCodec (Closed)
Patch Set: Add incremental decode, address code review comments. Created 4 years 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) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef GIFImageDecoder_h 26 #ifndef GIFImageDecoder_h
27 #define GIFImageDecoder_h 27 #define GIFImageDecoder_h
28 28
29 #include "platform/image-decoders/ImageDecoder.h" 29 #include "platform/image-decoders/ImageDecoder.h"
30 #include "third_party/skia/include/codec/SkCodec.h"
31 #include "third_party/skia/include/core/SkStream.h"
30 #include "wtf/Noncopyable.h" 32 #include "wtf/Noncopyable.h"
33 #include "wtf/RefPtr.h"
34 #include <algorithm>
31 #include <memory> 35 #include <memory>
32 36
33 class GIFImageReader;
34
35 typedef Vector<unsigned char> GIFRow;
36
37 namespace blink { 37 namespace blink {
38 38
39 // This class decodes the GIF image format. 39 // This class decodes the GIF image format.
40 class PLATFORM_EXPORT GIFImageDecoder final : public ImageDecoder { 40 class PLATFORM_EXPORT GIFImageDecoder final : public ImageDecoder {
41 WTF_MAKE_NONCOPYABLE(GIFImageDecoder); 41 WTF_MAKE_NONCOPYABLE(GIFImageDecoder);
42 42
43 public: 43 public:
44 GIFImageDecoder(AlphaOption, const ColorBehavior&, size_t maxDecodedBytes); 44 GIFImageDecoder(AlphaOption, const ColorBehavior&, size_t maxDecodedBytes);
45 ~GIFImageDecoder() override; 45 ~GIFImageDecoder() override;
46 46
47 enum GIFParseQuery { GIFSizeQuery, GIFFrameCountQuery };
48
49 // ImageDecoder: 47 // ImageDecoder:
50 String filenameExtension() const override { return "gif"; } 48 String filenameExtension() const override { return "gif"; }
51 void onSetData(SegmentReader* data) override; 49 void onSetData(SegmentReader* data) override;
52 int repetitionCount() const override; 50 int repetitionCount() const override;
53 bool frameIsCompleteAtIndex(size_t) const override; 51 bool frameIsCompleteAtIndex(size_t) const override;
54 float frameDurationAtIndex(size_t) const override; 52 float frameDurationAtIndex(size_t) const override;
55 // CAUTION: setFailed() deletes |m_reader|. Be careful to avoid
56 // accessing deleted memory, especially when calling this from inside
57 // GIFImageReader!
58 bool setFailed() override;
59
60 // Callbacks from the GIF reader.
61 bool haveDecodedRow(size_t frameIndex,
62 GIFRow::const_iterator rowBegin,
63 size_t width,
64 size_t rowNumber,
65 unsigned repeatCount,
66 bool writeTransparentPixels);
67 bool frameComplete(size_t frameIndex);
68
69 // For testing.
70 bool parseCompleted() const;
71 53
72 private: 54 private:
73 // ImageDecoder: 55 // ImageDecoder:
74 void clearFrameBuffer(size_t frameIndex) override; 56 void decodeSize() override;
75 virtual void decodeSize() { parse(GIFSizeQuery); }
76 size_t decodeFrameCount() override; 57 size_t decodeFrameCount() override;
77 void initializeNewFrame(size_t) override; 58 void initializeNewFrame(size_t) override;
78 void decode(size_t) override; 59 void decode(size_t) override;
79 60
80 // Parses as much as is needed to answer the query, ignoring bitmap 61 class SegmentStream : public SkStream {
81 // data. If parsing fails, sets the "decode failure" flag. 62 public:
82 void parse(GIFParseQuery); 63 SegmentStream()
64 : m_reader(),
65 m_position(0),
66 m_hasReadAllContents(true) {}
83 67
84 // Reset the alpha tracker for this frame. Before calling this method, the 68 void setReader(SegmentReader* reader, bool allContentsReceived) {
85 // caller must verify that the frame exists. 69 m_reader = reader;
86 void onInitFrameBuffer(size_t) override; 70 m_hasReadAllContents = false;
71 }
87 72
88 // When the disposal method of the frame is DisposeOverWritePrevious, the 73 size_t read(void* dst, size_t len) {
89 // next frame will use the previous frame's buffer as its starting state, so 74 len = std::min(len, m_reader->size());
90 // we can't take over the data in that case. Before calling this method, the
91 // caller must verify that the frame exists.
92 bool canReusePreviousFrameBuffer(size_t) const override;
93 75
94 bool m_currentBufferSawAlpha; 76 size_t bytesAdvanced = 0;
95 mutable int m_repetitionCount; 77 if (!dst) { // skipping, not reading
96 std::unique_ptr<GIFImageReader> m_reader; 78 bytesAdvanced = len;
79 } else {
80 size_t totalBytesRead = 0;
81 char* destAsCharPtr = reinterpret_cast<char*>(dst);
82 while (len) {
83 const char* segment = nullptr;
84 size_t bytesRead = m_reader->getSomeData(segment, m_position);
85 if (!bytesRead) {
86 break;
87 }
88 if (bytesRead > len) {
89 bytesRead = len;
90 }
91
92 memcpy(destAsCharPtr, segment, bytesRead);
93 destAsCharPtr += bytesRead;
94 len -= bytesRead;
95 totalBytesRead += bytesRead;
96 }
97
98 bytesAdvanced = totalBytesRead;
99 }
100
101 m_position += bytesAdvanced;
102 m_hasReadAllContents = m_position == m_reader->size();
103
104 return bytesAdvanced;
105 }
106
107 bool isAtEnd() const override { return m_hasReadAllContents; }
108
109 private:
110 WTF::RefPtr<SegmentReader> m_reader;
111 size_t m_position;
112 bool m_hasReadAllContents;
113 };
114
115 std::unique_ptr<SkCodec> m_codec;
116 SegmentStream* m_segmentStream;
117 // m_segmentStream is a raw pointer because it passes ownership to
118 // m_codec when m_codec is created. However, we still need the
119 // reference so we can append more data as it arrives.
97 }; 120 };
98 121
99 } // namespace blink 122 } // namespace blink
100 123
101 #endif 124 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698