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

Side by Side Diff: src/image/SkImage.cpp

Issue 1310633006: Add a SkPixelSerializer SkImage encode variant (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: updated Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 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 "SkBitmap.h" 8 #include "SkBitmap.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkData.h" 10 #include "SkData.h"
11 #include "SkImageGenerator.h" 11 #include "SkImageGenerator.h"
12 #include "SkImagePriv.h" 12 #include "SkImagePriv.h"
13 #include "SkImage_Base.h" 13 #include "SkImage_Base.h"
14 #include "SkNextID.h" 14 #include "SkNextID.h"
15 #include "SkPixelRef.h" 15 #include "SkPixelRef.h"
16 #include "SkPixelSerializer.h"
16 #include "SkReadPixelsRec.h" 17 #include "SkReadPixelsRec.h"
17 #include "SkString.h" 18 #include "SkString.h"
18 #include "SkSurface.h" 19 #include "SkSurface.h"
19 20
20 #if SK_SUPPORT_GPU 21 #if SK_SUPPORT_GPU
21 #include "GrTexture.h" 22 #include "GrTexture.h"
22 #include "GrContext.h" 23 #include "GrContext.h"
23 #include "SkImage_Gpu.h" 24 #include "SkImage_Gpu.h"
24 #endif 25 #endif
25 26
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 61 }
61 62
62 SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const { 63 SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const {
63 SkBitmap bm; 64 SkBitmap bm;
64 if (as_IB(this)->getROPixels(&bm)) { 65 if (as_IB(this)->getROPixels(&bm)) {
65 return SkImageEncoder::EncodeData(bm, type, quality); 66 return SkImageEncoder::EncodeData(bm, type, quality);
66 } 67 }
67 return nullptr; 68 return nullptr;
68 } 69 }
69 70
71 namespace {
72
73 class DefaultSerializer : public SkPixelSerializer {
74 protected:
75 bool onUseEncodedData(const void *data, size_t len) override {
76 return true;
77 }
78
79 SkData* onEncodePixels(const SkImageInfo& info, const void* pixels, size_t r owBytes) override {
80 return SkImageEncoder::EncodeData(info, pixels, rowBytes, SkImageEncoder ::kPNG_Type, 100);
81 }
82 };
83
84 } // anonymous namespace
85
86 SkData* SkImage::encode(SkPixelSerializer* serializer) const {
87 DefaultSerializer defaultSerializer;
88 SkPixelSerializer* effectiveSerializer = serializer ? serializer : &defaultS erializer;
89
90 SkAutoTUnref<SkData> encoded(this->refEncoded());
91 if (encoded && effectiveSerializer->useEncodedData(encoded->data(), encoded- >size())) {
92 return encoded.detach();
93 }
94
95 SkBitmap bm;
96 SkAutoPixmapUnlock apu;
97 if (as_IB(this)->getROPixels(&bm) && bm.requestLock(&apu)) {
98 const SkPixmap& pmap = apu.pixmap();
99 return effectiveSerializer->encodePixels(pmap.info(), pmap.addr(), pmap. rowBytes());
100 }
101
102 return nullptr;
103 }
104
70 SkData* SkImage::refEncoded() const { 105 SkData* SkImage::refEncoded() const {
71 return as_IB(this)->onRefEncoded(); 106 return as_IB(this)->onRefEncoded();
72 } 107 }
73 108
74 SkImage* SkImage::NewFromEncoded(SkData* encoded, const SkIRect* subset) { 109 SkImage* SkImage::NewFromEncoded(SkData* encoded, const SkIRect* subset) {
75 if (nullptr == encoded || 0 == encoded->size()) { 110 if (nullptr == encoded || 0 == encoded->size()) {
76 return nullptr; 111 return nullptr;
77 } 112 }
78 SkImageGenerator* generator = SkImageGenerator::NewFromEncoded(encoded); 113 SkImageGenerator* generator = SkImageGenerator::NewFromEncoded(encoded);
79 return generator ? SkImage::NewFromGenerator(generator, subset) : nullptr; 114 return generator ? SkImage::NewFromGenerator(generator, subset) : nullptr;
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 337
303 SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType) { 338 SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType) {
304 return nullptr; 339 return nullptr;
305 } 340 }
306 341
307 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, Sk AlphaType) { 342 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, Sk AlphaType) {
308 return nullptr; 343 return nullptr;
309 } 344 }
310 345
311 #endif 346 #endif
OLDNEW
« include/core/SkImage.h ('K') | « src/core/SkWriteBuffer.cpp ('k') | tests/ImageTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698