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

Side by Side Diff: src/codec/SkWebpCodec.h

Issue 2311793004: Use demux API in SkWebpCodec (Closed)
Patch Set: Forward declare Created 4 years, 3 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
« no previous file with comments | « no previous file | src/codec/SkWebpCodec.cpp » ('j') | src/codec/SkWebpCodec.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef SkWebpCodec_DEFINED 8 #ifndef SkWebpCodec_DEFINED
9 #define SkWebpCodec_DEFINED 9 #define SkWebpCodec_DEFINED
10 10
11 #include "SkCodec.h" 11 #include "SkCodec.h"
12 #include "SkColorSpace.h" 12 #include "SkColorSpace.h"
13 #include "SkEncodedFormat.h" 13 #include "SkEncodedFormat.h"
14 #include "SkImageInfo.h" 14 #include "SkImageInfo.h"
15 #include "SkTypes.h" 15 #include "SkTypes.h"
16 16
17 class SkStream; 17 class SkStream;
18 extern "C" {
19 struct WebPDemuxer;
20 void WebPDemuxDelete(WebPDemuxer* dmux);
21 }
18 22
19 static const size_t WEBP_VP8_HEADER_SIZE = 30; 23 static const size_t WEBP_VP8_HEADER_SIZE = 30;
20 24
21 class SkWebpCodec final : public SkCodec { 25 class SkWebpCodec final : public SkCodec {
22 public: 26 public:
23 // Assumes IsWebp was called and returned true. 27 // Assumes IsWebp was called and returned true.
24 static SkCodec* NewFromStream(SkStream*); 28 static SkCodec* NewFromStream(SkStream*);
25 static bool IsWebp(const void*, size_t); 29 static bool IsWebp(const void*, size_t);
26 protected: 30 protected:
27 Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMCo lor*, int*, int*) 31 Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMCo lor*, int*, int*)
28 override; 32 override;
29 SkEncodedFormat onGetEncodedFormat() const override { return kWEBP_SkEncoded Format; } 33 SkEncodedFormat onGetEncodedFormat() const override { return kWEBP_SkEncoded Format; }
30 34
31 SkISize onGetScaledDimensions(float desiredScale) const override; 35 SkISize onGetScaledDimensions(float desiredScale) const override;
32 36
33 bool onDimensionsSupported(const SkISize&) override; 37 bool onDimensionsSupported(const SkISize&) override;
34 38
35 bool onGetValidSubset(SkIRect* /* desiredSubset */) const override; 39 bool onGetValidSubset(SkIRect* /* desiredSubset */) const override;
36 private: 40 private:
37 SkWebpCodec(int width, int height, const SkEncodedInfo&, sk_sp<SkColorSpace> , SkStream*); 41 SkWebpCodec(int width, int height, const SkEncodedInfo&, sk_sp<SkColorSpace> , SkStream*,
42 WebPDemuxer*, sk_sp<SkData>);
43
44 SkAutoTCallVProc<WebPDemuxer, WebPDemuxDelete> fDemux;
45
46 // fDemux has a pointer into this data.
47 // This should not be freed until the decode is completed.
48 sk_sp<SkData> fData;
38 49
39 typedef SkCodec INHERITED; 50 typedef SkCodec INHERITED;
40 }; 51 };
41 #endif // SkWebpCodec_DEFINED 52 #endif // SkWebpCodec_DEFINED
OLDNEW
« no previous file with comments | « no previous file | src/codec/SkWebpCodec.cpp » ('j') | src/codec/SkWebpCodec.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698