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

Side by Side Diff: dm/DM.cpp

Issue 1294613002: Revert of SkScaledCodec class (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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 2013 Google Inc. 2 * Copyright 2013 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 "CrashHandler.h" 8 #include "CrashHandler.h"
9 #include "DMJsonWriter.h" 9 #include "DMJsonWriter.h"
10 #include "DMSrcSink.h" 10 #include "DMSrcSink.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded)); 205 SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
206 if (NULL == codec.get()) { 206 if (NULL == codec.get()) {
207 SkDebugf("Couldn't create codec for %s.", path.c_str()); 207 SkDebugf("Couldn't create codec for %s.", path.c_str());
208 return; 208 return;
209 } 209 }
210 210
211 // Choose scales for scaling tests. 211 // Choose scales for scaling tests.
212 // TODO (msarett): Add more scaling tests as we implement more flexible scal ing. 212 // TODO (msarett): Add more scaling tests as we implement more flexible scal ing.
213 // TODO (msarett): Implement scaling tests for SkImageDecoder in order to co mpare with these 213 // TODO (msarett): Implement scaling tests for SkImageDecoder in order to co mpare with these
214 // tests. SkImageDecoder supports downscales by integer fac tors. 214 // tests. SkImageDecoder supports downscales by integer fac tors.
215 // SkJpegCodec natively supports scaling to: 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875 215 const float scales[] = { 0.125f, 0.25f, 0.375f, 0.5f, 0.625f, 0.750f, 0.875f , 1.0f };
216 // 0.1, 0.16, 0.2 etc allow us to test SkScaledCodec with sampleSize 10, 6, 5, etc
217 // 0.4, 0.7 etc allow to test what happens when the client requests a scale that
218 // does not exactly match a sampleSize or native scaling capability
219 const float scales[] = { 0.1f, 0.125f, 0.166f, 0.2f, 0.25f, 0.333f, 0.375f, 0.4f, 0.5f, 0.6f,
220 0.625f, 0.750f, 0.8f, 0.875f, 1.0f };
221 216
222 for (float scale : scales) { 217 for (float scale : scales) {
223 if (scale != 1.0f && (path.endsWith(".webp") || path.endsWith(".WEBP"))) { 218 if (scale != 1.0f && (path.endsWith(".webp") || path.endsWith(".WEBP"))) {
224 // FIXME: skbug.com/4038 Scaling webp seems to leave some pixels uni nitialized/ 219 // FIXME: skbug.com/4038 Scaling webp seems to leave some pixels uni nitialized/
225 // compute their colors based on uninitialized values. 220 // compute their colors based on uninitialized values.
226 continue; 221 continue;
227 } 222 }
228 // Build additional test cases for images that decode natively to non-ca nvas types 223 // Build additional test cases for images that decode natively to non-ca nvas types
229 switch(codec->getInfo().colorType()) { 224 switch(codec->getInfo().colorType()) {
230 case kGray_8_SkColorType: 225 case kGray_8_SkColorType:
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
848 } 843 }
849 return 0; 844 return 0;
850 } 845 }
851 846
852 #if !defined(SK_BUILD_FOR_IOS) 847 #if !defined(SK_BUILD_FOR_IOS)
853 int main(int argc, char** argv) { 848 int main(int argc, char** argv) {
854 SkCommandLineFlags::Parse(argc, argv); 849 SkCommandLineFlags::Parse(argc, argv);
855 return dm_main(); 850 return dm_main();
856 } 851 }
857 #endif 852 #endif
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