AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use from/to_srgb

Browse Source 
Change-Id: I256dd98e1e918943195772954bc114e54b9325cd
Reviewed-on: https://skia-review.googlesource.com/140564
Commit-Queue: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
Mike Klein 2018-07-11 11:14:03 -04:00 committed by Skia Commit-Bot
parent 2267a09235
commit c3a5419423
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/SkColorSpaceXformSteps.cpp
View File

@ -41,8 +41,10 @@ SkColorSpaceXformSteps::SkColorSpaceXformSteps(SkColorSpace* src, SkAlphaType sr
SkColorSpaceTransferFn srcTF, dstTF;
SkAssertResult(src->isNumericalTransferFn(&srcTF));
SkAssertResult(dst->isNumericalTransferFn(&dstTF));
this->srcTF = srcTF;
this->dstTFInv = dstTF.invert();
this->srcTF = srcTF;
this->dstTFInv = dstTF.invert();
this->srcTF_is_sRGB = src->gammaCloseToSRGB();
this->dstTF_is_sRGB = dst->gammaCloseToSRGB();
// If we linearize then immediately reencode with the same transfer function, skip both.
if ( this->flags.linearize &&
@ -103,19 +105,25 @@ void SkColorSpaceXformSteps::apply(float* rgba) const {
void SkColorSpaceXformSteps::apply(SkRasterPipeline* p) const {
if (flags.unpremul) { p->append(SkRasterPipeline::unpremul); }
if (flags.linearize) {
// TODO: missing an opportunity to use from_srgb here.
p->append(SkRasterPipeline::parametric_r, &srcTF);
p->append(SkRasterPipeline::parametric_g, &srcTF);
p->append(SkRasterPipeline::parametric_b, &srcTF);
if (srcTF_is_sRGB) {
p->append(SkRasterPipeline::from_srgb);
} else {
p->append(SkRasterPipeline::parametric_r, &srcTF);
p->append(SkRasterPipeline::parametric_g, &srcTF);
p->append(SkRasterPipeline::parametric_b, &srcTF);
}
}
if (flags.gamut_transform) {
p->append(SkRasterPipeline::matrix_3x3, &src_to_dst_matrix);
}
if (flags.encode) {
// TODO: missing an opportunity to use to_srgb here.
p->append(SkRasterPipeline::parametric_r, &dstTFInv);
p->append(SkRasterPipeline::parametric_g, &dstTFInv);
p->append(SkRasterPipeline::parametric_b, &dstTFInv);
if (dstTF_is_sRGB) {
p->append(SkRasterPipeline::to_srgb);
} else {
p->append(SkRasterPipeline::parametric_r, &dstTFInv);
p->append(SkRasterPipeline::parametric_g, &dstTFInv);
p->append(SkRasterPipeline::parametric_b, &dstTFInv);
}
}
if (flags.premul) { p->append(SkRasterPipeline::premul); }
}

2
src/core/SkColorSpaceXformSteps.h
View File

@ -45,6 +45,8 @@ struct SkColorSpaceXformSteps {
Flags flags;
bool srcTF_is_sRGB,
dstTF_is_sRGB;
SkColorSpaceTransferFn srcTF, // Apply for linearize.
dstTFInv; // Apply for encode.
float src_to_dst_matrix[9]; // Apply this 3x3 column-major matrix for gamut_transform.