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

Side by Side Diff: bench/ColorCodecBench.cpp

Issue 2389983002: Refactored SkColorSpace and added in a Lab PCS GM (Closed)
Patch Set: migrated call from SkColorSpace_Base::makeLinearGamma() to SkColorSpace_XYZ::makeLinearGamma() Created 4 years, 2 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | dm/DMSrcSink.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 Google Inc. 2 * Copyright 2016 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "ColorCodecBench.h" 8 #include "ColorCodecBench.h"
9 #include "Resources.h" 9 #include "Resources.h"
10 #include "SkCodec.h" 10 #include "SkCodec.h"
11 #include "SkCodecPriv.h" 11 #include "SkCodecPriv.h"
12 #include "SkColorSpace_Base.h" 12 #include "SkColorSpace_XYZ.h"
13 #include "SkColorSpaceXform.h" 13 #include "SkColorSpaceXform.h"
14 #include "SkCommandLineFlags.h" 14 #include "SkCommandLineFlags.h"
15 15
16 #if defined(SK_TEST_QCMS) 16 #if defined(SK_TEST_QCMS)
17 DEFINE_bool(qcms, false, "Bench qcms color conversion"); 17 DEFINE_bool(qcms, false, "Bench qcms color conversion");
18 #endif 18 #endif
19 DEFINE_bool(xform_only, false, "Only time the color xform, do not include the de code time"); 19 DEFINE_bool(xform_only, false, "Only time the color xform, do not include the de code time");
20 DEFINE_bool(srgb, false, "Convert to srgb dst space"); 20 DEFINE_bool(srgb, false, "Convert to srgb dst space");
21 DEFINE_bool(nonstd, false, "Convert to non-standard dst space"); 21 DEFINE_bool(nonstd, false, "Convert to non-standard dst space");
22 DEFINE_bool(half, false, "Convert to half floats"); 22 DEFINE_bool(half, false, "Convert to half floats");
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 fDstSpace = FLAGS_srgb ? SkColorSpace::NewNamed(SkColorSpace::kSRGB_Name d) : 163 fDstSpace = FLAGS_srgb ? SkColorSpace::NewNamed(SkColorSpace::kSRGB_Name d) :
164 SkColorSpace::NewICC(dstData->data(), dstData-> size()); 164 SkColorSpace::NewICC(dstData->data(), dstData-> size());
165 SkASSERT(fDstSpace); 165 SkASSERT(fDstSpace);
166 } 166 }
167 167
168 fSrcInfo = codec->getInfo().makeColorType(kRGBA_8888_SkColorType); 168 fSrcInfo = codec->getInfo().makeColorType(kRGBA_8888_SkColorType);
169 fDstInfo = fSrcInfo; 169 fDstInfo = fSrcInfo;
170 170
171 if (FLAGS_half) { 171 if (FLAGS_half) {
172 fDstInfo = fDstInfo.makeColorType(kRGBA_F16_SkColorType); 172 fDstInfo = fDstInfo.makeColorType(kRGBA_F16_SkColorType);
173 fDstSpace = as_CSB(fDstSpace)->makeLinearGamma(); 173 SkASSERT(SkColorSpace_Base::Type::kXYZ == as_CSB(fDstSpace)->type());
174 fDstSpace = static_cast<SkColorSpace_XYZ*>(fDstSpace.get())->makeLinearG amma();
174 } 175 }
175 176
176 if (FLAGS_nonstd) { 177 if (FLAGS_nonstd) {
177 float gammas[3] = { 1.8f, 2.0f, 2.5f, }; 178 float gammas[3] = { 1.8f, 2.0f, 2.5f, };
178 SkMatrix44 matrix = SkMatrix44(SkMatrix44::kUninitialized_Constructor); 179 SkMatrix44 matrix = SkMatrix44(SkMatrix44::kUninitialized_Constructor);
179 matrix.set3x3(0.30f, 0.31f, 0.28f, 0.32f, 0.33f, 0.29f, 0.27f, 0.30f, 0. 30f); 180 matrix.set3x3(0.30f, 0.31f, 0.28f, 0.32f, 0.33f, 0.29f, 0.27f, 0.30f, 0. 30f);
180 fDstSpace = SkColorSpace::NewRGB(gammas, matrix); 181 fDstSpace = SkColorSpace::NewRGB(gammas, matrix);
181 } 182 }
182 183
183 fDstInfo = fDstInfo.makeColorSpace(fDstSpace); 184 fDstInfo = fDstInfo.makeColorSpace(fDstSpace);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 #endif 217 #endif
217 { 218 {
218 if (FLAGS_xform_only) { 219 if (FLAGS_xform_only) {
219 this->xformOnly(); 220 this->xformOnly();
220 } else { 221 } else {
221 this->decodeAndXform(); 222 this->decodeAndXform();
222 } 223 }
223 } 224 }
224 } 225 }
225 } 226 }
OLDNEW
« no previous file with comments | « no previous file | dm/DMSrcSink.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698