Revert of Add color space xform support to SkJpegCodec (includes F16!)

bench/ColorCodecBench.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "ColorCodecBench.h"
 #include "Resources.h"
 #include "SkCodec.h"
@@ skipping 23 matching lines @@
 const char* ColorCodecBench::onGetName() {
     return fName.c_str();
 }
 
 bool ColorCodecBench::isSuitableFor(Backend backend) {
     return kNonRendering_Backend == backend;
 }
 
 void ColorCodecBench::decodeAndXform() {
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fEncoded.get()));
-    SkASSERT(codec);
+#ifdef SK_DEBUG
+    const SkCodec::Result result =
+#endif
+    codec->startScanlineDecode(fSrcInfo);
+    SkASSERT(SkCodec::kSuccess == result);
 
+    sk_sp<SkColorSpace> srcSpace = sk_ref_sp(codec->getInfo().colorSpace());
+    if (!srcSpace) {
+        srcSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+    }
+    std::unique_ptr<SkColorSpaceXform> xform = SkColorSpaceXform::New(srcSpace, fDstSpace);
+    SkASSERT(xform);
+
+    void* dst = fDst.get();
+    for (int y = 0; y < fSrcInfo.height(); y++) {
 #ifdef SK_DEBUG
-    SkCodec::Result result =
+        const int rows =
 #endif
-    codec->getPixels(fDstInfo, fDst.get(), fDstInfo.minRowBytes());
-    SkASSERT(SkCodec::kSuccess == result);
+        codec->getScanlines(fSrc.get(), 1, 0);
+        SkASSERT(1 == rows);
+
+        FLAGS_half ?
+                xform->applyToF16((uint64_t*) dst, (uint32_t*) fSrc.get(), fSrcInfo.width()) :
+                xform->applyTo8888((SkPMColor*) dst, (uint32_t*) fSrc.get(), fSrcInfo.width());
+        dst = SkTAddOffset<void>(dst, fDstInfo.minRowBytes());
+    }
 }
 
 #if defined(SK_TEST_QCMS)
 void ColorCodecBench::decodeAndXformQCMS() {
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fEncoded.get()));
 #ifdef SK_DEBUG
     const SkCodec::Result result =
 #endif
     codec->startScanlineDecode(fSrcInfo);
     SkASSERT(SkCodec::kSuccess == result);
@@ skipping 34 matching lines @@
     }
     std::unique_ptr<SkColorSpaceXform> xform = SkColorSpaceXform::New(srcSpace, fDstSpace);
     SkASSERT(xform);
 
     void* dst = fDst.get();
     void* src = fSrc.get();
     for (int y = 0; y < fSrcInfo.height(); y++) {
         // Transform in place
         FLAGS_half ?
                 xform->applyToF16((uint64_t*) dst, (uint32_t*) src, fSrcInfo.width()) :
-                xform->applyToRGBA((SkPMColor*) dst, (uint32_t*) src, fSrcInfo.width());
+                xform->applyTo8888((SkPMColor*) dst, (uint32_t*) src, fSrcInfo.width());
         dst = SkTAddOffset<void>(dst, fDstInfo.minRowBytes());
         src = SkTAddOffset<void>(src, fSrcInfo.minRowBytes());
     }
 }
 
 #if defined(SK_TEST_QCMS)
 void ColorCodecBench::xformOnlyQCMS() {
     SkAutoTCallVProc<qcms_profile, qcms_profile_release>
             srcSpace(qcms_profile_from_memory(fSrcData->data(), fSrcData->size()));
     SkASSERT(srcSpace);
@@ skipping 15 matching lines @@
         // Transform in place
         qcms_transform_data_type(transform, src, dst, fSrcInfo.width(), outType);
         dst = SkTAddOffset<void>(dst, fDstInfo.minRowBytes());
         src = SkTAddOffset<void>(src, fSrcInfo.minRowBytes());
     }
 }
 #endif
 
 void ColorCodecBench::onDelayedSetup() {
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fEncoded.get()));
+    fSrcInfo = codec->getInfo().makeColorType(kRGBA_8888_SkColorType);
+
+    fDstInfo = fSrcInfo;
+    if (FLAGS_half) {
+        fDstInfo = fDstInfo.makeColorType(kRGBA_F16_SkColorType);
+    }
+    fDst.reset(fDstInfo.getSafeSize(fDstInfo.minRowBytes()));
+
+    if (FLAGS_xform_only) {
+        fSrc.reset(fSrcInfo.getSafeSize(fSrcInfo.minRowBytes()));
+        codec->getPixels(fSrcInfo, fSrc.get(), fSrcInfo.minRowBytes());
+    } else {
+        // Set-up a row buffer to decode into before transforming to dst.
+        fSrc.reset(fSrcInfo.minRowBytes());
+    }
+
     fSrcData = codec->getICCData();
     sk_sp<SkData> dstData = SkData::MakeFromFileName(
             GetResourcePath("monitor_profiles/HP_ZR30w.icc").c_str());
     SkASSERT(dstData);
 
-    fDstSpace = nullptr;
+
 #if defined(SK_TEST_QCMS)
     if (FLAGS_qcms) {
         fDstSpaceQCMS.reset(FLAGS_srgb ?
                 qcms_profile_sRGB() :
                 qcms_profile_from_memory(dstData->data(), dstData->size()));
         SkASSERT(fDstSpaceQCMS);
 
         // This call takes a non-trivial amount of time, but I think it's the most fair to
         // treat it as overhead.  It only needs to happen once.
         qcms_profile_precache_output_transform(fDstSpaceQCMS);
     } else
 #endif
     {
         fDstSpace = FLAGS_srgb ? SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) :
                                  SkColorSpace::NewICC(dstData->data(), dstData->size());
         SkASSERT(fDstSpace);
     }
-
-    fSrcInfo = codec->getInfo().makeColorType(kRGBA_8888_SkColorType);
-
-    fDstInfo = fSrcInfo.makeColorSpace(fDstSpace);
-    if (FLAGS_half) {
-        fDstInfo = fDstInfo.makeColorType(kRGBA_F16_SkColorType);
-    }
-    fDst.reset(fDstInfo.getSafeSize(fDstInfo.minRowBytes()));
-
-    if (FLAGS_xform_only) {
-        fSrc.reset(fSrcInfo.getSafeSize(fSrcInfo.minRowBytes()));
-        codec->getPixels(fSrcInfo, fSrc.get(), fSrcInfo.minRowBytes());
-    } else if (FLAGS_qcms) {
-        // Set-up a row buffer to decode into before transforming to dst.
-        fSrc.reset(fSrcInfo.minRowBytes());
-    }
 }
 
 void ColorCodecBench::onDraw(int n, SkCanvas*) {
 #if defined(SK_TEST_QCMS)
     bool to8888 = FLAGS_srgb || FLAGS_qcms;
 #else
     bool to8888 = FLAGS_srgb;
 #endif
     if (to8888 && FLAGS_half) {
         SkDebugf("Error: Contradicting flags.\n");
@@ skipping 12 matching lines @@
 #endif
         {
             if (FLAGS_xform_only) {
                 this->xformOnly();
             } else {
                 this->decodeAndXform();
             }
         }
     }
 }