aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/images/SkWEBPImageEncoder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/images/SkWEBPImageEncoder.cpp')
-rw-r--r--src/images/SkWEBPImageEncoder.cpp56
1 files changed, 11 insertions, 45 deletions
diff --git a/src/images/SkWEBPImageEncoder.cpp b/src/images/SkWEBPImageEncoder.cpp
index c0cd4a6cae..66b425bff5 100644
--- a/src/images/SkWEBPImageEncoder.cpp
+++ b/src/images/SkWEBPImageEncoder.cpp
@@ -26,7 +26,7 @@
#include "SkUnPreMultiply.h"
#include "SkUtils.h"
-// A WebP encoder only, on top of (subset of) libwebp
+// A WebP decoder only, on top of (subset of) libwebp
// For more information on WebP image format, and libwebp library, see:
// http://code.google.com/speed/webp/
// http://www.webmproject.org/code/#libwebp_webp_image_decoder_library
@@ -37,7 +37,6 @@ extern "C" {
// If moving libwebp out of skia source tree, path for webp headers must be
// updated accordingly. Here, we enforce using local copy in webp sub-directory.
#include "webp/encode.h"
-#include "webp/mux.h"
}
static transform_scanline_proc choose_proc(const SkImageInfo& info,
@@ -172,17 +171,10 @@ static bool do_encode(SkWStream* stream, const SkPixmap& pixmap, const SkEncodeO
WebPPicture pic;
WebPPictureInit(&pic);
- SkAutoTCallVProc<WebPPicture, WebPPictureFree> autoPic(&pic);
pic.width = pixmap.width();
pic.height = pixmap.height();
pic.writer = stream_writer;
-
- // If there is no need to embed an ICC profile, we write directly to the input stream.
- // Otherwise, we will first encode to |tmp| and use a mux to add the ICC chunk. libwebp
- // forces us to have an encoded image before we can add a profile.
- sk_sp<SkData> icc = pixmap.colorSpace() ? icc_from_color_space(*pixmap.colorSpace()) : nullptr;
- SkDynamicMemoryWStream tmp;
- pic.custom_ptr = icc ? (void*)&tmp : (void*)stream;
+ pic.custom_ptr = (void*)stream;
const uint8_t* src = (uint8_t*)pixmap.addr();
const int rgbStride = pic.width * bpp;
@@ -195,47 +187,21 @@ static bool do_encode(SkWStream* stream, const SkPixmap& pixmap, const SkEncodeO
proc((char*) &rgb[y * rgbStride], (const char*) &src[y * rowBytes], pic.width, bpp, colors);
}
- auto importProc = WebPPictureImportRGB;
- if (3 != bpp) {
+ bool ok;
+ if (bpp == 3) {
+ ok = SkToBool(WebPPictureImportRGB(&pic, &rgb[0], rgbStride));
+ } else {
if (pixmap.isOpaque()) {
- importProc = WebPPictureImportRGBX;
+ ok = SkToBool(WebPPictureImportRGBX(&pic, &rgb[0], rgbStride));
} else {
- importProc = WebPPictureImportRGBA;
+ ok = SkToBool(WebPPictureImportRGBA(&pic, &rgb[0], rgbStride));
}
}
- if (!importProc(&pic, &rgb[0], rgbStride)) {
- return false;
- }
-
- if (!WebPEncode(&webp_config, &pic)) {
- return false;
- }
-
- if (icc) {
- sk_sp<SkData> encodedData = tmp.detachAsData();
- WebPData encoded = { encodedData->bytes(), encodedData->size() };
- WebPData iccChunk = { icc->bytes(), icc->size() };
-
- SkAutoTCallVProc<WebPMux, WebPMuxDelete> mux(WebPMuxNew());
- if (WEBP_MUX_OK != WebPMuxSetImage(mux, &encoded, 0)) {
- return false;
- }
-
- if (WEBP_MUX_OK != WebPMuxSetChunk(mux, "ICCP", &iccChunk, 0)) {
- return false;
- }
-
- WebPData assembled;
- if (WEBP_MUX_OK != WebPMuxAssemble(mux, &assembled)) {
- return false;
- }
-
- stream->write(assembled.bytes, assembled.size);
- WebPDataClear(&assembled);
- }
+ ok = ok && WebPEncode(&webp_config, &pic);
+ WebPPictureFree(&pic);
- return true;
+ return ok;
}
bool SkEncodeImageAsWEBP(SkWStream* stream, const SkPixmap& src, int quality) {