aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gm/encode-platform.cpp10
-rw-r--r--gm/encode-srgb.cpp5
-rw-r--r--src/images/SkEncoder.h41
-rw-r--r--src/images/SkImageEncoder.cpp27
-rw-r--r--src/images/SkImageEncoderPriv.h27
-rw-r--r--src/images/SkJPEGImageEncoder.cpp52
-rw-r--r--src/images/SkJpegEncoder.h22
-rw-r--r--src/images/SkPNGImageEncoder.cpp446
-rw-r--r--src/images/SkPngEncoder.h56
-rw-r--r--tests/CodecTest.cpp18
-rw-r--r--tests/EncodeTest.cpp40
11 files changed, 467 insertions, 277 deletions
diff --git a/gm/encode-platform.cpp b/gm/encode-platform.cpp
index b6e0c1c1c3..fa940b6271 100644
--- a/gm/encode-platform.cpp
+++ b/gm/encode-platform.cpp
@@ -13,6 +13,7 @@
#include "SkImage.h"
#include "SkImageEncoderPriv.h"
#include "SkJpegEncoder.h"
+#include "SkPngEncoder.h"
#include "SkUnPreMultiply.h"
namespace skiagm {
@@ -69,9 +70,12 @@ static sk_sp<SkData> encode_data(SkEncodedImageFormat type, const SkBitmap& bitm
return SkEncodeImageWithWIC(&buf, src, type, 100) ? buf.detachAsData() : nullptr;
#else
switch (type) {
- case SkEncodedImageFormat::kPNG:
- return SkEncodeImageAsPNG(&buf, src, SkEncodeOptions()) ? buf.detachAsData()
- : nullptr;
+ case SkEncodedImageFormat::kPNG: {
+ SkPngEncoder::Options options;
+ options.fUnpremulBehavior = SkTransferFunctionBehavior::kIgnore;
+ bool success = SkPngEncoder::Encode(&buf, src, options);
+ return success ? buf.detachAsData() : nullptr;
+ }
case SkEncodedImageFormat::kJPEG: {
bool success = SkJpegEncoder::Encode(&buf, src, SkJpegEncoder::Options());
return success ? buf.detachAsData() : nullptr;
diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp
index bbaeaa7042..bf9ef821ab 100644
--- a/gm/encode-srgb.cpp
+++ b/gm/encode-srgb.cpp
@@ -15,6 +15,7 @@
#include "SkImage.h"
#include "SkImageEncoderPriv.h"
#include "SkJpegEncoder.h"
+#include "SkPngEncoder.h"
#include "SkPM4f.h"
#include "SkSRGB.h"
@@ -117,14 +118,16 @@ static sk_sp<SkData> encode_data(const SkBitmap& bitmap, SkEncodedImageFormat fo
}
SkDynamicMemoryWStream buf;
+ SkPngEncoder::Options pngOptions;
SkEncodeOptions options;
if (bitmap.colorSpace()) {
+ pngOptions.fUnpremulBehavior = SkTransferFunctionBehavior::kRespect;
options.fUnpremulBehavior = SkTransferFunctionBehavior::kRespect;
}
switch (format) {
case SkEncodedImageFormat::kPNG:
- SkAssertResult(SkEncodeImageAsPNG(&buf, src, options));
+ SkAssertResult(SkPngEncoder::Encode(&buf, src, pngOptions));
break;
case SkEncodedImageFormat::kWEBP:
SkAssertResult(SkEncodeImageAsWEBP(&buf, src, options));
diff --git a/src/images/SkEncoder.h b/src/images/SkEncoder.h
new file mode 100644
index 0000000000..e2686adb27
--- /dev/null
+++ b/src/images/SkEncoder.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkEncoder_DEFINED
+#define SkEncoder_DEFINED
+
+#include "SkPixmap.h"
+#include "SkTemplates.h"
+
+class SkEncoder : SkNoncopyable {
+public:
+
+ /**
+ * Encode |numRows| rows of input. If the caller requests more rows than are remaining
+ * in the src, this will encode all of the remaining rows. |numRows| must be greater
+ * than zero.
+ */
+ bool encodeRows(int numRows);
+
+ virtual ~SkEncoder() {}
+
+protected:
+
+ virtual bool onEncodeRows(int numRows) = 0;
+
+ SkEncoder(const SkPixmap& src, size_t storageBytes)
+ : fSrc(src)
+ , fCurrRow(0)
+ , fStorage(storageBytes)
+ {}
+
+ const SkPixmap& fSrc;
+ int fCurrRow;
+ SkAutoTMalloc<uint8_t> fStorage;
+};
+
+#endif
diff --git a/src/images/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp
index 23f46e4982..2daba483c5 100644
--- a/src/images/SkImageEncoder.cpp
+++ b/src/images/SkImageEncoder.cpp
@@ -7,6 +7,7 @@
#include "SkImageEncoderPriv.h"
#include "SkJpegEncoder.h"
+#include "SkPngEncoder.h"
bool SkEncodeImage(SkWStream* dst, const SkPixmap& src,
SkEncodedImageFormat format, int quality) {
@@ -22,8 +23,11 @@ bool SkEncodeImage(SkWStream* dst, const SkPixmap& src,
opts.fQuality = quality;
return SkJpegEncoder::Encode(dst, src, opts);
}
- case SkEncodedImageFormat::kPNG:
- return SkEncodeImageAsPNG(dst, src, SkEncodeOptions());
+ case SkEncodedImageFormat::kPNG: {
+ SkPngEncoder::Options opts;
+ opts.fUnpremulBehavior = SkTransferFunctionBehavior::kIgnore;
+ return SkPngEncoder::Encode(dst, src, opts);
+ }
case SkEncodedImageFormat::kWEBP:
return SkEncodeImageAsWEBP(dst, src, quality);
default:
@@ -31,3 +35,22 @@ bool SkEncodeImage(SkWStream* dst, const SkPixmap& src,
}
#endif
}
+
+bool SkEncoder::encodeRows(int numRows) {
+ SkASSERT(numRows > 0 && fCurrRow < fSrc.height());
+ if (numRows <= 0 || fCurrRow >= fSrc.height()) {
+ return false;
+ }
+
+ if (fCurrRow + numRows > fSrc.height()) {
+ numRows = fSrc.height() - fCurrRow;
+ }
+
+ if (!this->onEncodeRows(numRows)) {
+ // If we fail, short circuit any future calls.
+ fCurrRow = fSrc.height();
+ return false;
+ }
+
+ return true;
+}
diff --git a/src/images/SkImageEncoderPriv.h b/src/images/SkImageEncoderPriv.h
index 5e57cd128a..4d59d044c6 100644
--- a/src/images/SkImageEncoderPriv.h
+++ b/src/images/SkImageEncoderPriv.h
@@ -9,17 +9,32 @@
#define SkImageEncoderPriv_DEFINED
#include "SkImageEncoder.h"
+#include "SkImageInfoPriv.h"
+
+static inline bool SkPixmapIsValid(const SkPixmap& src,
+ SkTransferFunctionBehavior unpremulBehavior)
+{
+ if (SkTransferFunctionBehavior::kRespect == unpremulBehavior) {
+ if (!SkImageInfoIsValidRenderingCS(src.info())) {
+ return false;
+ }
+ } else {
+ if (!SkImageInfoIsValidAllowNumericalCS(src.info())) {
+ return false;
+ }
+ }
+
+ if (!src.addr() || src.rowBytes() < src.info().minRowBytes()) {
+ return false;
+ }
+
+ return true;
+}
struct SkEncodeOptions {
SkTransferFunctionBehavior fUnpremulBehavior = SkTransferFunctionBehavior::kIgnore;
};
-#ifdef SK_HAS_PNG_LIBRARY
- bool SkEncodeImageAsPNG(SkWStream*, const SkPixmap&, const SkEncodeOptions&);
-#else
- #define SkEncodeImageAsPNG(...) false
-#endif
-
#ifdef SK_HAS_WEBP_LIBRARY
bool SkEncodeImageAsWEBP(SkWStream*, const SkPixmap&, const SkEncodeOptions&);
bool SkEncodeImageAsWEBP(SkWStream*, const SkPixmap&, int quality);
diff --git a/src/images/SkJPEGImageEncoder.cpp b/src/images/SkJPEGImageEncoder.cpp
index 0603447e92..fd88a5c8f6 100644
--- a/src/images/SkJPEGImageEncoder.cpp
+++ b/src/images/SkJPEGImageEncoder.cpp
@@ -24,12 +24,7 @@ extern "C" {
#include "jerror.h"
}
-// This warning triggers false postives way too often in here.
-#if defined(__GNUC__) && !defined(__clang__)
- #pragma GCC diagnostic ignored "-Wclobbered"
-#endif
-
-class SkJpegEncoderMgr : SkNoncopyable {
+class SkJpegEncoderMgr final : SkNoncopyable {
public:
/*
@@ -128,23 +123,9 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& srcInfo) {
return true;
}
-class SkJpegEncoder_Base : public SkJpegEncoder {
-public:
- SkJpegEncoder_Base(std::unique_ptr<SkJpegEncoderMgr> encoderMgr, const SkPixmap& src);
-
- bool onEncodeRows(int numRows);
-
-private:
- std::unique_ptr<SkJpegEncoderMgr> fEncoderMgr;
- SkPixmap fSrc;
- int fCurrRow;
- SkAutoTMalloc<uint8_t> fStorage;
-};
-
std::unique_ptr<SkJpegEncoder> SkJpegEncoder::Make(SkWStream* dst, const SkPixmap& src,
const Options& options) {
- if (!SkImageInfoIsValidAllowNumericalCS(src.info()) || !src.addr() ||
- src.rowBytes() < src.info().minRowBytes()) {
+ if (!SkPixmapIsValid(src, SkTransferFunctionBehavior::kIgnore)) {
return nullptr;
}
@@ -178,35 +159,18 @@ std::unique_ptr<SkJpegEncoder> SkJpegEncoder::Make(SkWStream* dst, const SkPixma
}
}
- return std::unique_ptr<SkJpegEncoder>(new SkJpegEncoder_Base(std::move(encoderMgr), src));
+ return std::unique_ptr<SkJpegEncoder>(new SkJpegEncoder(std::move(encoderMgr), src));
}
-
-SkJpegEncoder_Base::SkJpegEncoder_Base(std::unique_ptr<SkJpegEncoderMgr> encoderMgr,
- const SkPixmap& src)
- : fEncoderMgr(std::move(encoderMgr))
- , fSrc(src)
- , fCurrRow(0)
- , fStorage(fEncoderMgr->proc() ? fEncoderMgr->cinfo()->input_components*src.width() : 0)
+SkJpegEncoder::SkJpegEncoder(std::unique_ptr<SkJpegEncoderMgr> encoderMgr, const SkPixmap& src)
+ : INHERITED(src, encoderMgr->proc() ? encoderMgr->cinfo()->input_components*src.width() : 0)
+ , fEncoderMgr(std::move(encoderMgr))
{}
-bool SkJpegEncoder::encodeRows(int numRows) {
- return ((SkJpegEncoder_Base*) this)->onEncodeRows(numRows);
-}
-
-bool SkJpegEncoder_Base::onEncodeRows(int numRows) {
- SkASSERT(numRows > 0 && fCurrRow < fSrc.height());
- if (numRows <= 0 || fCurrRow >= fSrc.height()) {
- return false;
- }
-
- if (fCurrRow + numRows > fSrc.height()) {
- numRows = fSrc.height() - fCurrRow;
- }
+SkJpegEncoder::~SkJpegEncoder() {}
+bool SkJpegEncoder::onEncodeRows(int numRows) {
if (setjmp(fEncoderMgr->jmpBuf())) {
- // Short circuit any future calls after failing.
- fCurrRow = fSrc.height();
return false;
}
diff --git a/src/images/SkJpegEncoder.h b/src/images/SkJpegEncoder.h
index 21613f90f0..49b49786c9 100644
--- a/src/images/SkJpegEncoder.h
+++ b/src/images/SkJpegEncoder.h
@@ -8,12 +8,12 @@
#ifndef SkJpegEncoder_DEFINED
#define SkJpegEncoder_DEFINED
-#include "SkPixmap.h"
-#include "SkTypes.h"
+#include "SkEncoder.h"
+class SkJpegEncoderMgr;
class SkWStream;
-class SkJpegEncoder : SkNoncopyable {
+class SkJpegEncoder : public SkEncoder {
public:
// TODO (skbug.com/1501):
@@ -48,14 +48,16 @@ public:
static std::unique_ptr<SkJpegEncoder> Make(SkWStream* dst, const SkPixmap& src,
const Options& options);
- /**
- * Encode |numRows| rows of input. If the caller requests more rows than are remaining
- * in the src, this will encode all of the remaining rows. |numRows| must be greater
- * than zero.
- */
- bool encodeRows(int numRows);
+ ~SkJpegEncoder() override;
+
+protected:
+ bool onEncodeRows(int numRows) override;
+
+private:
+ SkJpegEncoder(std::unique_ptr<SkJpegEncoderMgr>, const SkPixmap& src);
- virtual ~SkJpegEncoder() {}
+ std::unique_ptr<SkJpegEncoderMgr> fEncoderMgr;
+ typedef SkEncoder INHERITED;
};
#endif
diff --git a/src/images/SkPNGImageEncoder.cpp b/src/images/SkPNGImageEncoder.cpp
index b57c32a0fc..38c7d888c6 100644
--- a/src/images/SkPNGImageEncoder.cpp
+++ b/src/images/SkPNGImageEncoder.cpp
@@ -9,46 +9,159 @@
#ifdef SK_HAS_PNG_LIBRARY
-#include "SkColor.h"
-#include "SkColorPriv.h"
-#include "SkDither.h"
#include "SkImageEncoderFns.h"
-#include "SkMath.h"
+#include "SkImageInfoPriv.h"
#include "SkStream.h"
#include "SkString.h"
-#include "SkTemplates.h"
-#include "SkUnPreMultiply.h"
-#include "SkUtils.h"
+#include "SkPngEncoder.h"
#include "png.h"
-// Suppress most PNG warnings when calling image decode functions.
-static const bool c_suppressPNGImageDecoderWarnings = true;
+static constexpr bool kSuppressPngEncodeWarnings = true;
static void sk_error_fn(png_structp png_ptr, png_const_charp msg) {
- if (!c_suppressPNGImageDecoderWarnings) {
- SkDEBUGF(("------ png error %s\n", msg));
+ if (!kSuppressPngEncodeWarnings) {
+ SkDebugf("libpng encode error: %s\n", msg);
}
+
longjmp(png_jmpbuf(png_ptr), 1);
}
static void sk_write_fn(png_structp png_ptr, png_bytep data, png_size_t len) {
- SkWStream* sk_stream = (SkWStream*)png_get_io_ptr(png_ptr);
- if (!sk_stream->write(data, len)) {
- png_error(png_ptr, "sk_write_fn Error!");
+ SkWStream* stream = (SkWStream*)png_get_io_ptr(png_ptr);
+ if (!stream->write(data, len)) {
+ png_error(png_ptr, "sk_write_fn cannot write to stream");
}
}
-static void set_icc(png_structp png_ptr, png_infop info_ptr, sk_sp<SkData> icc) {
-#if PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5)
- const char* name = "Skia";
- png_const_bytep iccPtr = icc->bytes();
-#else
- SkString str("Skia");
- char* name = str.writable_str();
- png_charp iccPtr = (png_charp) icc->writable_data();
-#endif
- png_set_iCCP(png_ptr, info_ptr, name, 0, iccPtr, icc->size());
+class SkPngEncoderMgr final : SkNoncopyable {
+public:
+
+ /*
+ * Create the decode manager
+ * Does not take ownership of stream
+ */
+ static std::unique_ptr<SkPngEncoderMgr> Make(SkWStream* stream);
+
+ bool setHeader(const SkImageInfo& srcInfo);
+ bool setPalette(const SkImageInfo& srcInfo, SkColorTable* colorTable,
+ SkTransferFunctionBehavior);
+ bool setColorSpace(SkColorSpace* colorSpace);
+ bool writeInfo(const SkImageInfo& srcInfo);
+ void chooseProc(const SkImageInfo& srcInfo, SkTransferFunctionBehavior unpremulBehavior);
+
+ png_structp pngPtr() { return fPngPtr; }
+ png_infop infoPtr() { return fInfoPtr; }
+ int pngBytesPerPixel() const { return fPngBytesPerPixel; }
+ transform_scanline_proc proc() const { return fProc; }
+
+ ~SkPngEncoderMgr() {
+ png_destroy_write_struct(&fPngPtr, &fInfoPtr);
+ }
+
+private:
+
+ SkPngEncoderMgr(png_structp pngPtr, png_infop infoPtr)
+ : fPngPtr(pngPtr)
+ , fInfoPtr(infoPtr)
+ {}
+
+ png_structp fPngPtr;
+ png_infop fInfoPtr;
+ int fPngBytesPerPixel;
+ transform_scanline_proc fProc;
+};
+
+std::unique_ptr<SkPngEncoderMgr> SkPngEncoderMgr::Make(SkWStream* stream) {
+ png_structp pngPtr =
+ png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, sk_error_fn, nullptr);
+ if (!pngPtr) {
+ return nullptr;
+ }
+
+ png_infop infoPtr = png_create_info_struct(pngPtr);
+ if (!infoPtr) {
+ png_destroy_write_struct(&pngPtr, nullptr);
+ return nullptr;
+ }
+
+ png_set_write_fn(pngPtr, (void*)stream, sk_write_fn, nullptr);
+ return std::unique_ptr<SkPngEncoderMgr>(new SkPngEncoderMgr(pngPtr, infoPtr));
+}
+
+bool SkPngEncoderMgr::setHeader(const SkImageInfo& srcInfo) {
+ if (setjmp(png_jmpbuf(fPngPtr))) {
+ return false;
+ }
+
+ int pngColorType;
+ png_color_8 sigBit;
+ int bitDepth = 8;
+ switch (srcInfo.colorType()) {
+ case kRGBA_F16_SkColorType:
+ SkASSERT(srcInfo.colorSpace() && srcInfo.colorSpace()->gammaIsLinear());
+ sigBit.red = 16;
+ sigBit.green = 16;
+ sigBit.blue = 16;
+ sigBit.alpha = 16;
+ bitDepth = 16;
+ pngColorType = srcInfo.isOpaque() ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA;
+ fPngBytesPerPixel = 8;
+ break;
+ case kIndex_8_SkColorType:
+ sigBit.red = 8;
+ sigBit.green = 8;
+ sigBit.blue = 8;
+ sigBit.alpha = 8;
+ pngColorType = PNG_COLOR_TYPE_PALETTE;
+ fPngBytesPerPixel = 1;
+ break;
+ case kGray_8_SkColorType:
+ sigBit.gray = 8;
+ pngColorType = PNG_COLOR_TYPE_GRAY;
+ fPngBytesPerPixel = 1;
+ SkASSERT(srcInfo.isOpaque());
+ break;
+ case kRGBA_8888_SkColorType:
+ case kBGRA_8888_SkColorType:
+ sigBit.red = 8;
+ sigBit.green = 8;
+ sigBit.blue = 8;
+ sigBit.alpha = 8;
+ pngColorType = srcInfo.isOpaque() ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA;
+ fPngBytesPerPixel = srcInfo.isOpaque() ? 3 : 4;
+ break;
+ case kARGB_4444_SkColorType:
+ if (kUnpremul_SkAlphaType == srcInfo.alphaType()) {
+ return false;
+ }
+
+ sigBit.red = 4;
+ sigBit.green = 4;
+ sigBit.blue = 4;
+ sigBit.alpha = 4;
+ pngColorType = srcInfo.isOpaque() ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA;
+ fPngBytesPerPixel = srcInfo.isOpaque() ? 3 : 4;
+ break;
+ case kRGB_565_SkColorType:
+ sigBit.red = 5;
+ sigBit.green = 6;
+ sigBit.blue = 5;
+ pngColorType = PNG_COLOR_TYPE_RGB;
+ fPngBytesPerPixel = 3;
+ SkASSERT(srcInfo.isOpaque());
+ break;
+ default:
+ return false;
+ }
+
+ png_set_IHDR(fPngPtr, fInfoPtr, srcInfo.width(), srcInfo.height(),
+ bitDepth, pngColorType,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
+ PNG_FILTER_TYPE_BASE);
+ png_set_sBIT(fPngPtr, fInfoPtr, &sigBit);
+
+ return true;
}
static transform_scanline_proc choose_proc(const SkImageInfo& info,
@@ -115,10 +228,11 @@ static transform_scanline_proc choose_proc(const SkImageInfo& info,
}
}
-/* Pack palette[] with the corresponding colors, and if the image has alpha, also
- pack trans[] and return the number of alphas[] entries written. If the image is
- opaque, the return value will always be 0.
-*/
+/*
+ * Pack palette[] with the corresponding colors, and if the image has alpha, also
+ * pack trans[] and return the number of alphas[] entries written. If the image is
+ * opaque, the return value will always be 0.
+ */
static inline int pack_palette(SkColorTable* ctable, png_color* SK_RESTRICT palette,
png_byte* SK_RESTRICT alphas, const SkImageInfo& info,
SkTransferFunctionBehavior unpremulBehavior) {
@@ -146,7 +260,6 @@ static inline int pack_palette(SkColorTable* ctable, png_color* SK_RESTRICT pale
numWithAlpha++;
}
}
-
}
if (0 == numWithAlpha) {
@@ -177,214 +290,149 @@ static inline int pack_palette(SkColorTable* ctable, png_color* SK_RESTRICT pale
return numWithAlpha;
}
-static bool do_encode(SkWStream*, const SkPixmap&, int, int, png_color_8&,
- SkTransferFunctionBehavior unpremulBehavior);
+bool SkPngEncoderMgr::setPalette(const SkImageInfo& srcInfo, SkColorTable* colorTable,
+ SkTransferFunctionBehavior unpremulBehavior) {
+ if (setjmp(png_jmpbuf(fPngPtr))) {
+ return false;
+ }
-bool SkEncodeImageAsPNG(SkWStream* stream, const SkPixmap& pixmap, const SkEncodeOptions& opts) {
- if (SkTransferFunctionBehavior::kRespect == opts.fUnpremulBehavior) {
- if (!pixmap.colorSpace() || (!pixmap.colorSpace()->gammaCloseToSRGB() &&
- !pixmap.colorSpace()->gammaIsLinear())) {
+ png_color paletteColors[256];
+ png_byte trans[256];
+ if (kIndex_8_SkColorType == srcInfo.colorType()) {
+ if (!colorTable || colorTable->count() <= 0) {
return false;
}
- }
- if (!pixmap.addr() || pixmap.info().isEmpty()) {
- return false;
+ int numTrans = pack_palette(colorTable, paletteColors, trans, srcInfo, unpremulBehavior);
+ png_set_PLTE(fPngPtr, fInfoPtr, paletteColors, colorTable->count());
+ if (numTrans > 0) {
+ png_set_tRNS(fPngPtr, fInfoPtr, trans, numTrans, nullptr);
+ }
}
- const SkColorType colorType = pixmap.colorType();
- const SkAlphaType alphaType = pixmap.alphaType();
- switch (alphaType) {
- case kUnpremul_SkAlphaType:
- if (kARGB_4444_SkColorType == colorType) {
- return false;
- }
+ return true;
+}
- break;
- case kOpaque_SkAlphaType:
- case kPremul_SkAlphaType:
- break;
- default:
- return false;
+static void set_icc(png_structp png_ptr, png_infop info_ptr, const SkColorSpace& colorSpace) {
+ sk_sp<SkData> icc = icc_from_color_space(colorSpace);
+ if (!icc) {
+ return;
}
- const bool isOpaque = (kOpaque_SkAlphaType == alphaType);
- int bitDepth = 8;
- png_color_8 sig_bit;
- sk_bzero(&sig_bit, sizeof(png_color_8));
- int pngColorType;
- switch (colorType) {
- case kRGBA_F16_SkColorType:
- if (!pixmap.colorSpace() || !pixmap.colorSpace()->gammaIsLinear()) {
- return false;
- }
+#if PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5)
+ const char* name = "Skia";
+ png_const_bytep iccPtr = icc->bytes();
+#else
+ SkString str("Skia");
+ char* name = str.writable_str();
+ png_charp iccPtr = (png_charp) icc->writable_data();
+#endif
+ png_set_iCCP(png_ptr, info_ptr, name, 0, iccPtr, icc->size());
+}
- sig_bit.red = 16;
- sig_bit.green = 16;
- sig_bit.blue = 16;
- sig_bit.alpha = 16;
- bitDepth = 16;
- pngColorType = isOpaque ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA;
- break;
- case kIndex_8_SkColorType:
- sig_bit.red = 8;
- sig_bit.green = 8;
- sig_bit.blue = 8;
- sig_bit.alpha = 8;
- pngColorType = PNG_COLOR_TYPE_PALETTE;
- break;
- case kGray_8_SkColorType:
- sig_bit.gray = 8;
- pngColorType = PNG_COLOR_TYPE_GRAY;
- SkASSERT(isOpaque);
- break;
- case kRGBA_8888_SkColorType:
- case kBGRA_8888_SkColorType:
- sig_bit.red = 8;
- sig_bit.green = 8;
- sig_bit.blue = 8;
- sig_bit.alpha = 8;
- pngColorType = isOpaque ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA;
- break;
- case kARGB_4444_SkColorType:
- sig_bit.red = 4;
- sig_bit.green = 4;
- sig_bit.blue = 4;
- sig_bit.alpha = 4;
- pngColorType = isOpaque ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA;
- break;
- case kRGB_565_SkColorType:
- sig_bit.red = 5;
- sig_bit.green = 6;
- sig_bit.blue = 5;
- pngColorType = PNG_COLOR_TYPE_RGB;
- SkASSERT(isOpaque);
- break;
- default:
- return false;
+bool SkPngEncoderMgr::setColorSpace(SkColorSpace* colorSpace) {
+ if (setjmp(png_jmpbuf(fPngPtr))) {
+ return false;
}
- if (kIndex_8_SkColorType == colorType) {
- SkColorTable* ctable = pixmap.ctable();
- if (!ctable || ctable->count() == 0) {
- return false;
+ if (colorSpace) {
+ if (colorSpace->isSRGB()) {
+ png_set_sRGB(fPngPtr, fInfoPtr, PNG_sRGB_INTENT_PERCEPTUAL);
+ } else {
+ set_icc(fPngPtr, fInfoPtr, *colorSpace);
}
-
- // Currently, we always use 8-bit indices for paletted pngs.
- // When ctable->count() <= 16, we could potentially use 1, 2,
- // or 4 bit indices.
}
- return do_encode(stream, pixmap, pngColorType, bitDepth, sig_bit, opts.fUnpremulBehavior);
+ return true;
}
-static int num_components(int pngColorType) {
- switch (pngColorType) {
- case PNG_COLOR_TYPE_PALETTE:
- case PNG_COLOR_TYPE_GRAY:
- return 1;
- case PNG_COLOR_TYPE_RGB:
- return 3;
- case PNG_COLOR_TYPE_RGBA:
- return 4;
- default:
- SkASSERT(false);
- return 0;
+bool SkPngEncoderMgr::writeInfo(const SkImageInfo& srcInfo) {
+ if (setjmp(png_jmpbuf(fPngPtr))) {
+ return false;
+ }
+
+ png_write_info(fPngPtr, fInfoPtr);
+ if (kRGBA_F16_SkColorType == srcInfo.colorType() &&
+ kOpaque_SkAlphaType == srcInfo.alphaType())
+ {
+ // For kOpaque, kRGBA_F16, we will keep the row as RGBA and tell libpng
+ // to skip the alpha channel.
+ png_set_filler(fPngPtr, 0, PNG_FILLER_AFTER);
}
+
+ return true;
}
-static bool do_encode(SkWStream* stream, const SkPixmap& pixmap, int pngColorType, int bitDepth,
- png_color_8& sig_bit, SkTransferFunctionBehavior unpremulBehavior) {
- png_structp png_ptr;
- png_infop info_ptr;
+void SkPngEncoderMgr::chooseProc(const SkImageInfo& srcInfo,
+ SkTransferFunctionBehavior unpremulBehavior) {
+ fProc = choose_proc(srcInfo, unpremulBehavior);
+}
- png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, sk_error_fn, nullptr);
- if (nullptr == png_ptr) {
- return false;
+std::unique_ptr<SkPngEncoder> SkPngEncoder::Make(SkWStream* dst, const SkPixmap& src,
+ const Options& options) {
+ if (!SkPixmapIsValid(src, options.fUnpremulBehavior)) {
+ return nullptr;
}
- info_ptr = png_create_info_struct(png_ptr);
- if (nullptr == info_ptr) {
- png_destroy_write_struct(&png_ptr, nullptr);
- return false;
+ std::unique_ptr<SkPngEncoderMgr> encoderMgr = SkPngEncoderMgr::Make(dst);
+ if (!encoderMgr) {
+ return nullptr;
}
- /* Set error handling. REQUIRED if you aren't supplying your own
- * error handling functions in the png_create_write_struct() call.
- */
- if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_write_struct(&png_ptr, &info_ptr);
- return false;
+ if (!encoderMgr->setHeader(src.info())) {
+ return nullptr;
}
- png_set_write_fn(png_ptr, (void*)stream, sk_write_fn, nullptr);
-
- /* Set the image information here. Width and height are up to 2^31,
- * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
- * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
- * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
- * or PNG_COLOR_TYPE_RGB_ALPHA. interlace is either PNG_INTERLACE_NONE or
- * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
- * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED
- */
-
- png_set_IHDR(png_ptr, info_ptr, pixmap.width(), pixmap.height(),
- bitDepth, pngColorType,
- PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
- PNG_FILTER_TYPE_BASE);
+ if (!encoderMgr->setPalette(src.info(), src.ctable(), options.fUnpremulBehavior)) {
+ return nullptr;
+ }
- // set our colortable/trans arrays if needed
- png_color paletteColors[256];
- png_byte trans[256];
- if (kIndex_8_SkColorType == pixmap.colorType()) {
- SkColorTable* colorTable = pixmap.ctable();
- SkASSERT(colorTable);
- int numTrans = pack_palette(colorTable, paletteColors, trans, pixmap.info(),
- unpremulBehavior);
- png_set_PLTE(png_ptr, info_ptr, paletteColors, colorTable->count());
- if (numTrans > 0) {
- png_set_tRNS(png_ptr, info_ptr, trans, numTrans, nullptr);
- }
+ if (!encoderMgr->setColorSpace(src.colorSpace())) {
+ return nullptr;
}
- if (pixmap.colorSpace()) {
- if (pixmap.colorSpace()->isSRGB()) {
- png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_PERCEPTUAL);
- } else {
- sk_sp<SkData> icc = icc_from_color_space(*pixmap.colorSpace());
- if (icc) {
- set_icc(png_ptr, info_ptr, std::move(icc));
- }
- }
+ if (!encoderMgr->writeInfo(src.info())) {
+ return nullptr;
}
- png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- png_write_info(png_ptr, info_ptr);
- int pngBytesPerPixel = num_components(pngColorType) * (bitDepth / 8);
- if (kRGBA_F16_SkColorType == pixmap.colorType() && kOpaque_SkAlphaType == pixmap.alphaType()) {
- // For kOpaque, kRGBA_F16, we will keep the row as RGBA and tell libpng
- // to skip the alpha channel.
- png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
- pngBytesPerPixel = 8;
+ encoderMgr->chooseProc(src.info(), options.fUnpremulBehavior);
+
+ return std::unique_ptr<SkPngEncoder>(new SkPngEncoder(std::move(encoderMgr), src));
+}
+
+SkPngEncoder::SkPngEncoder(std::unique_ptr<SkPngEncoderMgr> encoderMgr, const SkPixmap& src)
+ : INHERITED(src, encoderMgr->pngBytesPerPixel() * src.width())
+ , fEncoderMgr(std::move(encoderMgr))
+{}
+
+SkPngEncoder::~SkPngEncoder() {}
+
+bool SkPngEncoder::onEncodeRows(int numRows) {
+ if (setjmp(png_jmpbuf(fEncoderMgr->pngPtr()))) {
+ return false;
}
- SkAutoSTMalloc<1024, char> rowStorage(pixmap.width() * pngBytesPerPixel);
- char* storage = rowStorage.get();
- const char* srcImage = (const char*)pixmap.addr();
- transform_scanline_proc proc = choose_proc(pixmap.info(), unpremulBehavior);
- for (int y = 0; y < pixmap.height(); y++) {
- png_bytep row_ptr = (png_bytep)storage;
- proc(storage, srcImage, pixmap.width(), SkColorTypeBytesPerPixel(pixmap.colorType()),
- nullptr);
- png_write_rows(png_ptr, &row_ptr, 1);
- srcImage += pixmap.rowBytes();
+ const void* srcRow = fSrc.addr(0, fCurrRow);
+ for (int y = 0; y < numRows; y++) {
+ fEncoderMgr->proc()((char*) fStorage.get(), (const char*) srcRow, fSrc.width(),
+ SkColorTypeBytesPerPixel(fSrc.colorType()), nullptr);
+
+ png_bytep rowPtr = (png_bytep) fStorage.get();
+ png_write_rows(fEncoderMgr->pngPtr(), &rowPtr, 1);
+ srcRow = SkTAddOffset<const void>(srcRow, fSrc.rowBytes());
}
- png_write_end(png_ptr, info_ptr);
+ fCurrRow += numRows;
+ if (fCurrRow == fSrc.height()) {
+ png_write_end(fEncoderMgr->pngPtr(), fEncoderMgr->infoPtr());
+ }
- /* clean up after the write, and free any memory allocated */
- png_destroy_write_struct(&png_ptr, &info_ptr);
return true;
}
+bool SkPngEncoder::Encode(SkWStream* dst, const SkPixmap& src, const Options& options) {
+ auto encoder = SkPngEncoder::Make(dst, src, options);
+ return encoder.get() && encoder->encodeRows(src.height());
+}
+
#endif
diff --git a/src/images/SkPngEncoder.h b/src/images/SkPngEncoder.h
new file mode 100644
index 0000000000..af1056cc92
--- /dev/null
+++ b/src/images/SkPngEncoder.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPngEncoder_DEFINED
+#define SkPngEncoder_DEFINED
+
+#include "SkEncoder.h"
+
+class SkPngEncoderMgr;
+class SkWStream;
+
+class SkPngEncoder : public SkEncoder {
+public:
+
+ // TODO (skbug.com/6409):
+ // Add options for png filters and zlib compression.
+
+ struct Options {
+ SkTransferFunctionBehavior fUnpremulBehavior = SkTransferFunctionBehavior::kRespect;
+ };
+
+ /**
+ * Encode the |src| pixels to the |dst| stream.
+ * |options| may be used to control the encoding behavior.
+ *
+ * Returns true on success. Returns false on an invalid or unsupported |src|.
+ */
+ static bool Encode(SkWStream* dst, const SkPixmap& src, const Options& options);
+
+ /**
+ * Create a png encoder that will encode the |src| pixels to the |dst| stream.
+ * |options| may be used to control the encoding behavior.
+ *
+ * |dst| is unowned but must remain valid for the lifetime of the object.
+ *
+ * This returns nullptr on an invalid or unsupported |src|.
+ */
+ static std::unique_ptr<SkPngEncoder> Make(SkWStream* dst, const SkPixmap& src,
+ const Options& options);
+
+ ~SkPngEncoder() override;
+
+protected:
+ bool onEncodeRows(int numRows) override;
+
+ SkPngEncoder(std::unique_ptr<SkPngEncoderMgr>, const SkPixmap& src);
+
+ std::unique_ptr<SkPngEncoderMgr> fEncoderMgr;
+ typedef SkEncoder INHERITED;
+};
+
+#endif
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index 45362db72c..43035213d9 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -22,6 +22,7 @@
#include "SkOSPath.h"
#include "SkJpegEncoder.h"
#include "SkPngChunkReader.h"
+#include "SkPngEncoder.h"
#include "SkRandom.h"
#include "SkStream.h"
#include "SkStreamPriv.h"
@@ -1525,16 +1526,21 @@ DEF_TEST(Codec_InvalidAnimated, r) {
}
static void encode_format(SkDynamicMemoryWStream* stream, const SkPixmap& pixmap,
- const SkEncodeOptions& opts, SkEncodedImageFormat format) {
+ SkTransferFunctionBehavior unpremulBehavior,
+ SkEncodedImageFormat format) {
+ SkPngEncoder::Options pngOptions;
+ SkEncodeOptions options;
+ pngOptions.fUnpremulBehavior = unpremulBehavior;
+ options.fUnpremulBehavior = unpremulBehavior;
switch (format) {
case SkEncodedImageFormat::kPNG:
- SkEncodeImageAsPNG(stream, pixmap, opts);
+ SkPngEncoder::Encode(stream, pixmap, pngOptions);
break;
case SkEncodedImageFormat::kJPEG:
SkJpegEncoder::Encode(stream, pixmap, SkJpegEncoder::Options());
break;
case SkEncodedImageFormat::kWEBP:
- SkEncodeImageAsWEBP(stream, pixmap, opts);
+ SkEncodeImageAsWEBP(stream, pixmap, options);
break;
default:
SkASSERT(false);
@@ -1552,9 +1558,7 @@ static void test_encode_icc(skiatest::Reporter* r, SkEncodedImageFormat format,
SkPixmap pixmap;
srgbBitmap.peekPixels(&pixmap);
SkDynamicMemoryWStream srgbBuf;
- SkEncodeOptions opts;
- opts.fUnpremulBehavior = unpremulBehavior;
- encode_format(&srgbBuf, pixmap, opts, format);
+ encode_format(&srgbBuf, pixmap, unpremulBehavior, format);
sk_sp<SkData> srgbData = srgbBuf.detachAsData();
std::unique_ptr<SkCodec> srgbCodec(SkCodec::NewFromData(srgbData));
REPORTER_ASSERT(r, srgbCodec->getInfo().colorSpace() == SkColorSpace::MakeSRGB().get());
@@ -1564,7 +1568,7 @@ static void test_encode_icc(skiatest::Reporter* r, SkEncodedImageFormat format,
sk_sp<SkColorSpace> p3 = SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma,
SkColorSpace::kDCIP3_D65_Gamut);
pixmap.setColorSpace(p3);
- encode_format(&p3Buf, pixmap, opts, format);
+ encode_format(&p3Buf, pixmap, unpremulBehavior, format);
sk_sp<SkData> p3Data = p3Buf.detachAsData();
std::unique_ptr<SkCodec> p3Codec(SkCodec::NewFromData(p3Data));
REPORTER_ASSERT(r, p3Codec->getInfo().colorSpace()->gammaCloseToSRGB());
diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp
index 9db5039d59..a3b39f23c5 100644
--- a/tests/EncodeTest.cpp
+++ b/tests/EncodeTest.cpp
@@ -9,10 +9,35 @@
#include "Test.h"
#include "SkBitmap.h"
+#include "SkEncodedImageFormat.h"
#include "SkJpegEncoder.h"
+#include "SkPngEncoder.h"
#include "SkStream.h"
-DEF_TEST(Encode_Jpeg, r) {
+static bool encode(SkEncodedImageFormat format, SkWStream* dst, const SkPixmap& src) {
+ switch (format) {
+ case SkEncodedImageFormat::kJPEG:
+ return SkJpegEncoder::Encode(dst, src, SkJpegEncoder::Options());
+ case SkEncodedImageFormat::kPNG:
+ return SkPngEncoder::Encode(dst, src, SkPngEncoder::Options());
+ default:
+ return nullptr;
+ }
+}
+
+static std::unique_ptr<SkEncoder> make(SkEncodedImageFormat format, SkWStream* dst,
+ const SkPixmap& src) {
+ switch (format) {
+ case SkEncodedImageFormat::kJPEG:
+ return SkJpegEncoder::Make(dst, src, SkJpegEncoder::Options());
+ case SkEncodedImageFormat::kPNG:
+ return SkPngEncoder::Make(dst, src, SkPngEncoder::Options());
+ default:
+ return nullptr;
+ }
+}
+
+static void test_encode(skiatest::Reporter* r, SkEncodedImageFormat format) {
SkBitmap bitmap;
bool success = GetResourceAsBitmap("mandrill_128.png", &bitmap);
if (!success) {
@@ -27,22 +52,22 @@ DEF_TEST(Encode_Jpeg, r) {
}
SkDynamicMemoryWStream dst0, dst1, dst2, dst3;
- success = SkJpegEncoder::Encode(&dst0, src, SkJpegEncoder::Options());
+ success = encode(format, &dst0, src);
REPORTER_ASSERT(r, success);
- auto encoder1 = SkJpegEncoder::Make(&dst1, src, SkJpegEncoder::Options());
+ auto encoder1 = make(format, &dst1, src);
for (int i = 0; i < src.height(); i++) {
success = encoder1->encodeRows(1);
REPORTER_ASSERT(r, success);
}
- auto encoder2 = SkJpegEncoder::Make(&dst2, src, SkJpegEncoder::Options());
+ auto encoder2 = make(format, &dst2, src);
for (int i = 0; i < src.height(); i+=3) {
success = encoder2->encodeRows(3);
REPORTER_ASSERT(r, success);
}
- auto encoder3 = SkJpegEncoder::Make(&dst3, src, SkJpegEncoder::Options());
+ auto encoder3 = make(format, &dst3, src);
success = encoder3->encodeRows(200);
REPORTER_ASSERT(r, success);
@@ -54,3 +79,8 @@ DEF_TEST(Encode_Jpeg, r) {
REPORTER_ASSERT(r, data0->equals(data2.get()));
REPORTER_ASSERT(r, data0->equals(data3.get()));
}
+
+DEF_TEST(Encoder, r) {
+ test_encode(r, SkEncodedImageFormat::kJPEG);
+ test_encode(r, SkEncodedImageFormat::kPNG);
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 02:48:52 +0000