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

Side by Side Diff: src/codec/SkCodec.cpp

Issue 1044433002: Add SkWebpCodec, for decoding .webp images. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 8 months 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 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkCodec.h" 8 #include "SkCodec.h"
9 #include "SkData.h" 9 #include "SkData.h"
10 #include "SkCodec_libbmp.h" 10 #include "SkCodec_libbmp.h"
11 #include "SkCodec_libgif.h" 11 #include "SkCodec_libgif.h"
12 #include "SkCodec_libico.h" 12 #include "SkCodec_libico.h"
13 #include "SkCodec_libpng.h" 13 #include "SkCodec_libpng.h"
14 #include "SkCodec_wbmp.h" 14 #include "SkCodec_wbmp.h"
15 #include "SkCodecPriv.h" 15 #include "SkCodecPriv.h"
16 #include "SkStream.h" 16 #include "SkStream.h"
17 #include "SkWebpCodec.h"
17 18
18 struct DecoderProc { 19 struct DecoderProc {
19 bool (*IsFormat)(SkStream*); 20 bool (*IsFormat)(SkStream*);
20 SkCodec* (*NewFromStream)(SkStream*); 21 SkCodec* (*NewFromStream)(SkStream*);
21 }; 22 };
22 23
23 static const DecoderProc gDecoderProcs[] = { 24 static const DecoderProc gDecoderProcs[] = {
24 { SkPngCodec::IsPng, SkPngCodec::NewFromStream }, 25 { SkPngCodec::IsPng, SkPngCodec::NewFromStream },
26 { SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream },
25 { SkGifCodec::IsGif, SkGifCodec::NewFromStream }, 27 { SkGifCodec::IsGif, SkGifCodec::NewFromStream },
26 { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream }, 28 { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream },
27 { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream }, 29 { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream },
28 { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewFromStream } 30 { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewFromStream }
29 }; 31 };
30 32
31 SkCodec* SkCodec::NewFromStream(SkStream* stream) { 33 SkCodec* SkCodec::NewFromStream(SkStream* stream) {
32 if (!stream) { 34 if (!stream) {
33 return NULL; 35 return NULL;
34 } 36 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 return kNoRewindNecessary_RewindState; 86 return kNoRewindNecessary_RewindState;
85 } 87 }
86 return fStream->rewind() ? kRewound_RewindState 88 return fStream->rewind() ? kRewound_RewindState
87 : kCouldNotRewind_RewindState; 89 : kCouldNotRewind_RewindState;
88 } 90 }
89 91
90 SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) { 92 SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) {
91 fScanlineDecoder.reset(this->onGetScanlineDecoder(dstInfo)); 93 fScanlineDecoder.reset(this->onGetScanlineDecoder(dstInfo));
92 return fScanlineDecoder.get(); 94 return fScanlineDecoder.get();
93 } 95 }
OLDNEW
« no previous file with comments | « gyp/codec.gyp ('k') | src/codec/SkWebpCodec.h » ('j') | src/codec/SkWebpCodec.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698