diff options
Diffstat (limited to 'bench/EncoderBench.cpp')
| -rw-r--r-- | bench/EncoderBench.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/bench/EncoderBench.cpp b/bench/EncoderBench.cpp index f0adaa1071..d7ddfbc602 100644 --- a/bench/EncoderBench.cpp +++ b/bench/EncoderBench.cpp @@ -11,11 +11,9 @@ #include "SkData.h" #include "SkImageEncoder.h" -#include "sk_tool_utils.h" - class EncodeBench : public Benchmark { public: - EncodeBench(const char* filename, SkEncodedImageFormat type, int quality) + EncodeBench(const char* filename, SkImageEncoder::Type type, int quality) : fFilename(filename) , fType(type) , fQuality(quality) @@ -25,13 +23,13 @@ public: name.append(filename); name.append("_"); switch (type) { - case SkEncodedImageFormat::kJPEG: + case SkImageEncoder::kJPEG_Type: name.append("JPEG"); break; - case SkEncodedImageFormat::kPNG: + case SkImageEncoder::kPNG_Type: name.append("PNG"); break; - case SkEncodedImageFormat::kWEBP: + case SkImageEncoder::kWEBP_Type: name.append("WEBP"); break; default: @@ -56,14 +54,14 @@ public: void onDraw(int loops, SkCanvas*) override { for (int i = 0; i < loops; i++) { - sk_sp<SkData> data(sk_tool_utils::EncodeImageToData(fBitmap, fType, fQuality)); + sk_sp<SkData> data(SkImageEncoder::EncodeData(fBitmap, fType, fQuality)); SkASSERT(data); } } private: const char* fFilename; - const SkEncodedImageFormat fType; + const SkImageEncoder::Type fType; const int fQuality; SkString fName; SkBitmap fBitmap; @@ -71,13 +69,13 @@ private: // The Android Photos app uses a quality of 90 on JPEG encodes -DEF_BENCH(return new EncodeBench("mandrill_512.png", SkEncodedImageFormat::kJPEG, 90)); -DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkEncodedImageFormat::kJPEG, 90)); +DEF_BENCH(return new EncodeBench("mandrill_512.png", SkImageEncoder::kJPEG_Type, 90)); +DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkImageEncoder::kJPEG_Type, 90)); // PNG encodes are lossless so quality should be ignored -DEF_BENCH(return new EncodeBench("mandrill_512.png", SkEncodedImageFormat::kPNG, 90)); -DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkEncodedImageFormat::kPNG, 90)); +DEF_BENCH(return new EncodeBench("mandrill_512.png", SkImageEncoder::kPNG_Type, 90)); +DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkImageEncoder::kPNG_Type, 90)); // TODO: What is the appropriate quality to use to benchmark WEBP encodes? -DEF_BENCH(return new EncodeBench("mandrill_512.png", SkEncodedImageFormat::kWEBP, 90)); -DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkEncodedImageFormat::kWEBP, 90)); +DEF_BENCH(return new EncodeBench("mandrill_512.png", SkImageEncoder::kWEBP_Type, 90)); +DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkImageEncoder::kWEBP_Type, 90)); |