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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/core/SkColorSpaceXform.cpp

Issue 2449243003: Initial implementation of a SkColorSpace_A2B xform (Closed)
Patch Set: moved all the (now) unused stuff back from SkColorSpaceXformPriv.h to SkColorSpaceXform.cpp Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkColorLookUpTable.cpp ('k') | src/core/SkColorSpaceXformPriv.h » ('j') | src/core/SkColorSpaceXform_A2B.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkColorSpaceXform.cpp
diff --git a/src/core/SkColorSpaceXform.cpp b/src/core/SkColorSpaceXform.cpp
index c92c37f75b9ac73532e3a94ba3c9c7227f5c9cf3..3ec8d3bba629f426a1745a1aed18183b3fa35ff8 100644
--- a/src/core/SkColorSpaceXform.cpp
+++ b/src/core/SkColorSpaceXform.cpp
@@ -10,7 +10,9 @@
#include "SkColorSpace_Base.h"
#include "SkColorSpace_XYZ.h"
#include "SkColorSpacePriv.h"
+#include "SkColorSpaceXform_A2B.h"
#include "SkColorSpaceXform_Base.h"
+#include "SkColorSpaceXformPriv.h"
#include "SkHalf.h"
#include "SkOpts.h"
#include "SkSRGB.h"
@@ -90,14 +92,6 @@ static void build_table_linear_from_gamma(float* outTable, float exponent) {
}
}
-// Interpolating lookup in a variably sized table.
-static float interp_lut(float input, const float* table, int tableSize) {
- float index = input * (tableSize - 1);
- float diff = index - sk_float_floor2int(index);
- return table[(int) sk_float_floor2int(index)] * (1.0f - diff) +
- table[(int) sk_float_ceil2int(index)] * diff;
-}
-
// outTable is always 256 entries, inTable may be larger or smaller.
static void build_table_linear_from_gamma(float* outTable, const float* inTable,
int inTableSize) {
@@ -151,32 +145,6 @@ static void build_table_linear_to_gamma(uint8_t* outTable, float exponent) {
}
}
-// Inverse table lookup. Ex: what index corresponds to the input value? This will
-// have strange results when the table is non-increasing. But any sane gamma
-// function will be increasing.
-static float inverse_interp_lut(float input, const float* table, int tableSize) {
- if (input <= table[0]) {
- return table[0];
- } else if (input >= table[tableSize - 1]) {
- return 1.0f;
- }
-
- for (int i = 1; i < tableSize; i++) {
- if (table[i] >= input) {
- // We are guaranteed that input is greater than table[i - 1].
- float diff = input - table[i - 1];
- float distance = table[i] - table[i - 1];
- float index = (i - 1) + diff / distance;
- return index / (tableSize - 1);
- }
- }
-
- // Should be unreachable, since we'll return before the loop if input is
- // larger than the last entry.
- SkASSERT(false);
- return 0.0f;
-}
-
static void build_table_linear_to_gamma(uint8_t* outTable, const float* inTable,
int inTableSize) {
for (int i = 0; i < kDstGammaTableSize; i++) {
@@ -345,18 +313,14 @@ std::unique_ptr<SkColorSpaceXform> SkColorSpaceXform::New(SkColorSpace* srcSpace
}
if (SkColorSpace_Base::Type::kA2B == as_CSB(dstSpace)->type()) {
- SkColorSpacePrintf("A2B destinations not supported\n");
+ SkCSXformPrintf("A2B destinations not supported\n");
return nullptr;
}
if (SkColorSpace_Base::Type::kA2B == as_CSB(srcSpace)->type()) {
- // TODO (raftias): return an A2B-supporting SkColorSpaceXform here once the xform.
- // is implemented. SkColorSpaceXform_Base only supports XYZ+TRC based SkColorSpaces
- //SkColorSpace_A2B* src = static_cast<SkColorSpace_A2B*>(srcSpace);
- //SkColorSpace_XYZ* dst = static_cast<SkColorSpace_XYZ*>(dstSpace);
- //return std::unique_ptr<SkColorSpaceXform>(new SkColorSpaceXform_A2B(src, dst));
- SkColorSpacePrintf("A2B sources not supported (yet)\n");
- return nullptr;
+ SkColorSpace_A2B* src = static_cast<SkColorSpace_A2B*>(srcSpace);
+ SkColorSpace_XYZ* dst = static_cast<SkColorSpace_XYZ*>(dstSpace);
+ return std::unique_ptr<SkColorSpaceXform>(new SkColorSpaceXform_A2B(src, dst));
}
SkColorSpace_XYZ* srcSpaceXYZ = static_cast<SkColorSpace_XYZ*>(srcSpace);
SkColorSpace_XYZ* dstSpaceXYZ = static_cast<SkColorSpace_XYZ*>(dstSpace);
@@ -516,6 +480,28 @@ static AI void set_rb_shifts(Order kOrder, int* kRShift, int* kBShift) {
}
template <Order kOrder>
+static AI void load_rgb_linear(const uint32_t* src, Sk4f& r, Sk4f& g, Sk4f& b, Sk4f& a,
msarett1 2016/11/11 14:36:51 nit: move these down, back where they were
raftias 2016/11/11 19:36:05 Done.
+ const float* const[3]) {
+ int kRShift, kGShift = 8, kBShift;
+ set_rb_shifts(kOrder, &kRShift, &kBShift);
+ r = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kRShift) & 0xFF);
+ g = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kGShift) & 0xFF);
+ b = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kBShift) & 0xFF);
+ a = 0.0f; // Don't let the compiler complain that |a| is uninitialized.
+}
+
+template <Order kOrder>
+static AI void load_rgba_linear(const uint32_t* src, Sk4f& r, Sk4f& g, Sk4f& b, Sk4f& a,
+ const float* const[3]) {
+ int kRShift, kGShift = 8, kBShift;
+ set_rb_shifts(kOrder, &kRShift, &kBShift);
+ r = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kRShift) & 0xFF);
+ g = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kGShift) & 0xFF);
+ b = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kBShift) & 0xFF);
+ a = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> 24));
+}
+
+template <Order kOrder>
static AI void load_rgb_from_tables(const uint32_t* src,
Sk4f& r, Sk4f& g, Sk4f& b, Sk4f& a,
const float* const srcTables[3]) {
@@ -558,30 +544,6 @@ static AI void load_rgba_from_tables(const uint32_t* src,
}
template <Order kOrder>
-static AI void load_rgb_linear(const uint32_t* src,
- Sk4f& r, Sk4f& g, Sk4f& b, Sk4f& a,
- const float* const[3]) {
- int kRShift, kGShift = 8, kBShift;
- set_rb_shifts(kOrder, &kRShift, &kBShift);
- r = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kRShift) & 0xFF);
- g = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kGShift) & 0xFF);
- b = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kBShift) & 0xFF);
- a = 0.0f; // Don't let the compiler complain that |a| is uninitialized.
-}
-
-template <Order kOrder>
-static AI void load_rgba_linear(const uint32_t* src,
- Sk4f& r, Sk4f& g, Sk4f& b, Sk4f& a,
- const float* const[3]) {
- int kRShift, kGShift = 8, kBShift;
- set_rb_shifts(kOrder, &kRShift, &kBShift);
- r = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kRShift) & 0xFF);
- g = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kGShift) & 0xFF);
- b = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> kBShift) & 0xFF);
- a = (1.0f / 255.0f) * SkNx_cast<float>((Sk4u::Load(src) >> 24));
-}
-
-template <Order kOrder>
static AI void load_rgb_from_tables_1(const uint32_t* src,
Sk4f& r, Sk4f& g, Sk4f& b, Sk4f& a,
const float* const srcTables[3]) {
@@ -665,8 +627,7 @@ static AI void premultiply_1(const Sk4f& a, Sk4f& rgba) {
}
template <Order kOrder>
-static AI void store_srgb(void* dst, const uint32_t* src,
- Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f&,
+static AI void store_srgb(void* dst, const uint32_t* src, Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f&,
const uint8_t* const[3]) {
int kRShift, kGShift = 8, kBShift;
set_rb_shifts(kOrder, &kRShift, &kBShift);
@@ -714,8 +675,7 @@ static AI Sk4f linear_to_2dot2(const Sk4f& x) {
}
template <Order kOrder>
-static AI void store_2dot2(void* dst, const uint32_t* src,
- Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f&,
+static AI void store_2dot2(void* dst, const uint32_t* src, Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f&,
const uint8_t* const[3]) {
int kRShift, kGShift = 8, kBShift;
set_rb_shifts(kOrder, &kRShift, &kBShift);
@@ -753,8 +713,7 @@ static AI void store_2dot2_1(void* dst, const uint32_t* src,
}
template <Order kOrder>
-static AI void store_linear(void* dst, const uint32_t* src,
- Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f&,
+static AI void store_linear(void* dst, const uint32_t* src, Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f&,
const uint8_t* const[3]) {
int kRShift, kGShift = 8, kBShift;
set_rb_shifts(kOrder, &kRShift, &kBShift);
@@ -788,9 +747,8 @@ static AI void store_linear_1(void* dst, const uint32_t* src,
}
template <Order kOrder>
-static AI void store_f16(void* dst, const uint32_t* src,
- Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f& da,
- const uint8_t* const[3]) {
+static AI void store_f16(void* dst, const uint32_t* src, Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f& da,
+ const uint8_t* const[3]) {
Sk4h::Store4(dst, SkFloatToHalf_finite_ftz(dr),
SkFloatToHalf_finite_ftz(dg),
SkFloatToHalf_finite_ftz(db),
@@ -806,8 +764,7 @@ static AI void store_f16_1(void* dst, const uint32_t* src,
}
template <Order kOrder>
-static AI void store_f32(void* dst, const uint32_t* src,
- Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f& da,
+static AI void store_f32(void* dst, const uint32_t* src, Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f& da,
const uint8_t* const[3]) {
Sk4f::Store4(dst, dr, dg, db, da);
}
@@ -821,9 +778,8 @@ static AI void store_f32_1(void* dst, const uint32_t* src,
}
template <Order kOrder>
-static AI void store_f16_opaque(void* dst, const uint32_t* src,
- Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f&,
- const uint8_t* const[3]) {
+static AI void store_f16_opaque(void* dst, const uint32_t* src, Sk4f& dr, Sk4f& dg, Sk4f& db,
+ Sk4f&, const uint8_t* const[3]) {
Sk4h::Store4(dst, SkFloatToHalf_finite_ftz(dr),
SkFloatToHalf_finite_ftz(dg),
SkFloatToHalf_finite_ftz(db),
@@ -841,9 +797,8 @@ static AI void store_f16_1_opaque(void* dst, const uint32_t* src,
}
template <Order kOrder>
-static AI void store_generic(void* dst, const uint32_t* src,
- Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f&,
- const uint8_t* const dstTables[3]) {
+static AI void store_generic(void* dst, const uint32_t* src, Sk4f& dr, Sk4f& dg, Sk4f& db, Sk4f&,
+ const uint8_t* const dstTables[3]) {
int kRShift, kGShift = 8, kBShift;
set_rb_shifts(kOrder, &kRShift, &kBShift);
dr = Sk4f::Min(Sk4f::Max(1023.0f * dr, 0.0f), 1023.0f);
@@ -1105,7 +1060,7 @@ static void color_xform_RGBA(void* dst, const void* vsrc, int len,
///////////////////////////////////////////////////////////////////////////////////////////////////
-static inline int num_tables(SkColorSpace_XYZ* space) {
+static AI int num_tables(SkColorSpace_XYZ* space) {
switch (space->gammaNamed()) {
case kSRGB_SkGammaNamed:
case k2Dot2Curve_SkGammaNamed:
« no previous file with comments | « src/core/SkColorLookUpTable.cpp ('k') | src/core/SkColorSpaceXformPriv.h » ('j') | src/core/SkColorSpaceXform_A2B.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698