6b622963a0
This reverts commit5f7b5e3624
. Reason for revert: Codec CL has re-landed. Original change's description: > Revert "Stop conflating F16 with linear gamma" > > This reverts commitd1589c7213
. > > Reason for revert: Depends on skcms CL that's been reverted. > > Original change's description: > > Stop conflating F16 with linear gamma > > > > Note to self: I debugged this, realized that the codecs > > need to handle A2B -> XYZ, then realized that I just need > > to wait for https://skia-review.googlesource.com/c/skia/+/136062 > > > > Bug: skia: > > Change-Id: I594c22076feb3700b8a40c471a541fef5ff4e13e > > Reviewed-on: https://skia-review.googlesource.com/137587 > > Commit-Queue: Brian Osman <brianosman@google.com> > > Reviewed-by: Mike Klein <mtklein@google.com> > > TBR=mtklein@google.com,brianosman@google.com > > Change-Id: I6dca583697c8efd2563d30cb7ab9ef505b6903ae > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/148860 > Reviewed-by: Brian Osman <brianosman@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> TBR=mtklein@google.com,brianosman@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia: Change-Id: Iee66531049843758e7ed4130b99d8df6a553d805 Reviewed-on: https://skia-review.googlesource.com/149700 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
145 lines
4.5 KiB
C++
145 lines
4.5 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm.h"
|
|
|
|
#include "Resources.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkCodec.h"
|
|
#include "SkData.h"
|
|
#include "SkImage.h"
|
|
#include "SkImageEncoderPriv.h"
|
|
#include "SkJpegEncoder.h"
|
|
#include "SkPngEncoder.h"
|
|
#include "SkPM4f.h"
|
|
#include "SkWebpEncoder.h"
|
|
|
|
namespace skiagm {
|
|
|
|
static const int imageWidth = 128;
|
|
static const int imageHeight = 128;
|
|
|
|
static void make(SkBitmap* bitmap, SkColorType colorType, SkAlphaType alphaType,
|
|
sk_sp<SkColorSpace> colorSpace) {
|
|
const char* resource;
|
|
switch (colorType) {
|
|
case kGray_8_SkColorType:
|
|
resource = "images/grayscale.jpg";
|
|
alphaType = kOpaque_SkAlphaType;
|
|
break;
|
|
case kRGB_565_SkColorType:
|
|
resource = "images/color_wheel.jpg";
|
|
alphaType = kOpaque_SkAlphaType;
|
|
break;
|
|
default:
|
|
resource = (kOpaque_SkAlphaType == alphaType) ? "images/color_wheel.jpg"
|
|
: "images/color_wheel.png";
|
|
break;
|
|
}
|
|
|
|
sk_sp<SkData> data = GetResourceAsData(resource);
|
|
std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(data);
|
|
if (kRGBA_F16_SkColorType == colorType && !colorSpace) {
|
|
colorSpace = SkColorSpace::MakeSRGB();
|
|
}
|
|
SkImageInfo dstInfo = codec->getInfo().makeColorType(colorType)
|
|
.makeAlphaType(alphaType)
|
|
.makeColorSpace(colorSpace);
|
|
bitmap->allocPixels(dstInfo);
|
|
codec->getPixels(dstInfo, bitmap->getPixels(), bitmap->rowBytes());
|
|
}
|
|
|
|
static sk_sp<SkData> encode_data(const SkBitmap& bitmap, SkEncodedImageFormat format) {
|
|
SkPixmap src;
|
|
if (!bitmap.peekPixels(&src)) {
|
|
return nullptr;
|
|
}
|
|
SkDynamicMemoryWStream buf;
|
|
|
|
switch (format) {
|
|
case SkEncodedImageFormat::kPNG:
|
|
SkAssertResult(SkPngEncoder::Encode(&buf, src, SkPngEncoder::Options()));
|
|
break;
|
|
case SkEncodedImageFormat::kWEBP:
|
|
SkAssertResult(SkWebpEncoder::Encode(&buf, src, SkWebpEncoder::Options()));
|
|
break;
|
|
case SkEncodedImageFormat::kJPEG:
|
|
SkAssertResult(SkJpegEncoder::Encode(&buf, src, SkJpegEncoder::Options()));
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return buf.detachAsData();
|
|
}
|
|
|
|
class EncodeSRGBGM : public GM {
|
|
public:
|
|
EncodeSRGBGM(SkEncodedImageFormat format)
|
|
: fEncodedFormat(format)
|
|
{}
|
|
|
|
protected:
|
|
SkString onShortName() override {
|
|
const char* format = nullptr;
|
|
switch (fEncodedFormat) {
|
|
case SkEncodedImageFormat::kPNG:
|
|
format = "png";
|
|
break;
|
|
case SkEncodedImageFormat::kWEBP:
|
|
format = "webp";
|
|
break;
|
|
case SkEncodedImageFormat::kJPEG:
|
|
format = "jpg";
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return SkStringPrintf("encode-srgb-%s", format);
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(imageWidth * 2, imageHeight * 15);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
const SkColorType colorTypes[] = {
|
|
kN32_SkColorType, kRGBA_F16_SkColorType, kGray_8_SkColorType, kRGB_565_SkColorType,
|
|
};
|
|
const SkAlphaType alphaTypes[] = {
|
|
kUnpremul_SkAlphaType, kPremul_SkAlphaType, kOpaque_SkAlphaType,
|
|
};
|
|
const sk_sp<SkColorSpace> colorSpaces[] = {
|
|
nullptr, SkColorSpace::MakeSRGB(),
|
|
};
|
|
|
|
SkBitmap bitmap;
|
|
for (SkColorType colorType : colorTypes) {
|
|
for (SkAlphaType alphaType : alphaTypes) {
|
|
canvas->save();
|
|
for (sk_sp<SkColorSpace> colorSpace : colorSpaces) {
|
|
make(&bitmap, colorType, alphaType, colorSpace);
|
|
auto image = SkImage::MakeFromEncoded(encode_data(bitmap, fEncodedFormat));
|
|
canvas->drawImage(image.get(), 0.0f, 0.0f);
|
|
canvas->translate((float) imageWidth, 0.0f);
|
|
}
|
|
canvas->restore();
|
|
canvas->translate(0.0f, (float) imageHeight);
|
|
}
|
|
}
|
|
}
|
|
|
|
private:
|
|
SkEncodedImageFormat fEncodedFormat;
|
|
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
DEF_GM( return new EncodeSRGBGM(SkEncodedImageFormat::kPNG); )
|
|
DEF_GM( return new EncodeSRGBGM(SkEncodedImageFormat::kWEBP); )
|
|
DEF_GM( return new EncodeSRGBGM(SkEncodedImageFormat::kJPEG); )
|
|
}
|