SkImageEncoder: simplify API

(re-land 248ff02 & 2cb6cb7, with changes)

  - Hide SkImageEncoder class in private header.
  - SkImageEncoder::Type becomes SkEncodedImageFormat
  - SkEncodedFormat becomes SkEncodedImageFormat
  - SkImageEncoder static functions replaced with
    single function EncodeImage()
  - utility wrappers for EncodeImage() are in
    sk_tool_utils.h

TODO: remove link-time registration mechanism.
TODO: clean up clients use of API and flip the flag.
TODO: implement EncodeImage() in chromeium/skia/ext

Change-Id: I47d451e50be4d5c6c130869c7fa7c2857243d9f0
Reviewed-on: https://skia-review.googlesource.com/4909
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-on: https://skia-review.googlesource.com/5186
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>

3 files changed, 18 insertions, 14 deletions

diff --git a/bench/EncoderBench.cpp b/bench/EncoderBench.cpp
index d7ddfbc602..f0adaa1071 100644
--- a/bench/EncoderBench.cpp
+++ b/bench/EncoderBench.cpp
@@ -11,9 +11,11 @@
 #include "SkData.h"
 #include "SkImageEncoder.h"
 
+#include "sk_tool_utils.h"
+
 class EncodeBench : public Benchmark {
 public:
-    EncodeBench(const char* filename, SkImageEncoder::Type type, int quality)
+    EncodeBench(const char* filename, SkEncodedImageFormat type, int quality)
         : fFilename(filename)
         , fType(type)
         , fQuality(quality)
@@ -23,13 +25,13 @@ public:
         name.append(filename);
         name.append("_");
         switch (type) {
-            case SkImageEncoder::kJPEG_Type:
+            case SkEncodedImageFormat::kJPEG:
                 name.append("JPEG");
                 break;
-            case SkImageEncoder::kPNG_Type:
+            case SkEncodedImageFormat::kPNG:
                 name.append("PNG");
                 break;
-            case SkImageEncoder::kWEBP_Type:
+            case SkEncodedImageFormat::kWEBP:
                 name.append("WEBP");
                 break;
             default:
@@ -54,14 +56,14 @@ public:
 
     void onDraw(int loops, SkCanvas*) override {
         for (int i = 0; i < loops; i++) {
-            sk_sp<SkData> data(SkImageEncoder::EncodeData(fBitmap, fType, fQuality));
+            sk_sp<SkData> data(sk_tool_utils::EncodeImageToData(fBitmap, fType, fQuality));
             SkASSERT(data);
         }
     }
 
 private:
     const char*                fFilename;
-    const SkImageEncoder::Type fType;
+    const SkEncodedImageFormat fType;
     const int                  fQuality;
     SkString                   fName;
     SkBitmap                   fBitmap;
@@ -69,13 +71,13 @@ private:
 
 
 // The Android Photos app uses a quality of 90 on JPEG encodes
-DEF_BENCH(return new EncodeBench("mandrill_512.png", SkImageEncoder::kJPEG_Type, 90));
-DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkImageEncoder::kJPEG_Type, 90));
+DEF_BENCH(return new EncodeBench("mandrill_512.png", SkEncodedImageFormat::kJPEG, 90));
+DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkEncodedImageFormat::kJPEG, 90));
 
 // PNG encodes are lossless so quality should be ignored
-DEF_BENCH(return new EncodeBench("mandrill_512.png", SkImageEncoder::kPNG_Type, 90));
-DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkImageEncoder::kPNG_Type, 90));
+DEF_BENCH(return new EncodeBench("mandrill_512.png", SkEncodedImageFormat::kPNG, 90));
+DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkEncodedImageFormat::kPNG, 90));
 
 // TODO: What is the appropriate quality to use to benchmark WEBP encodes?
-DEF_BENCH(return new EncodeBench("mandrill_512.png", SkImageEncoder::kWEBP_Type, 90));
-DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkImageEncoder::kWEBP_Type, 90));
+DEF_BENCH(return new EncodeBench("mandrill_512.png", SkEncodedImageFormat::kWEBP, 90));
+DEF_BENCH(return new EncodeBench("color_wheel.jpg", SkEncodedImageFormat::kWEBP, 90));
diff --git a/bench/GLBench.cpp b/bench/GLBench.cpp
index a39edeee7f..cb824daadc 100644
--- a/bench/GLBench.cpp
+++ b/bench/GLBench.cpp
@@ -15,6 +15,8 @@
 #include "SkSLCompiler.h"
 #include <stdio.h>
 
+#include "sk_tool_utils.h"
+
 const GrGLContext* GLBench::getGLContext(SkCanvas* canvas) {
     // This bench exclusively tests GL calls directly
     if (nullptr == canvas->getGrContext()) {
@@ -181,7 +183,7 @@ void GLBench::DumpImage(const GrGLInterface* gl, uint32_t screenWidth, uint32_t
 
     bm.setPixels(readback.get());
 
-    if (!SkImageEncoder::EncodeFile(filename, bm, SkImageEncoder::kPNG_Type, 100)) {
+    if (!sk_tool_utils::EncodeImageToFile(filename, bm, SkEncodedImageFormat::kPNG, 100)) {
         SkDebugf("------ failed to encode %s\n", filename);
         remove(filename);   // remove any partial file
         return;
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 9b4db96d01..35872427af 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -300,7 +300,7 @@ static bool write_canvas_png(Target* target, const SkString& filename) {
         SkDebugf("Can't write %s.\n", filename.c_str());
         return false;
     }
-    if (!SkImageEncoder::EncodeStream(&stream, bmp, SkImageEncoder::kPNG_Type, 100)) {
+    if (!SkEncodeImage(&stream, bmp, SkEncodedImageFormat::kPNG, 100)) {
         SkDebugf("Can't encode a PNG.\n");
         return false;
     }