commit 9ce3a543c92a73e6daca420defc042886b3f2019
author msarett <msarett@google.com> Fri Jul 15 13:54:38 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jul 15 13:54:38 2016 -0700
tree a8e10d6d44d42202d019a724faa934998f6f2e9b
parent 7ac5da853457b032781cf865ba018de78508edb7

Add capability for SkColorXform to output half floats

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2147763002
CQ_INCLUDE_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot;master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot

Review-Url: https://codereview.chromium.org/2147763002

dm/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 78fa140..932d80f 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -837,9 +837,10 @@
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-ColorCodecSrc::ColorCodecSrc(Path path, Mode mode)
+ColorCodecSrc::ColorCodecSrc(Path path, Mode mode, SkColorType colorType)
     : fPath(path)
     , fMode(mode)
+    , fColorType(colorType)
 {}
 
 bool ColorCodecSrc::veto(SinkFlags flags) const {
@@ -852,6 +853,10 @@
         return Error::Nonfatal("No need to test color correction to 565 backend.");
     }
 
+    if (nullptr == canvas->imageInfo().colorSpace() && kRGBA_F16_SkColorType == fColorType) {
+        return Error::Nonfatal("F16 does not draw in legacy mode.");
+    }
+
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     if (!encoded) {
         return SkStringPrintf("Couldn't read %s.", fPath.c_str());
@@ -862,7 +867,7 @@
         return SkStringPrintf("Couldn't create codec for %s.", fPath.c_str());
     }
 
-    SkImageInfo info = codec->getInfo().makeColorType(kN32_SkColorType);
+    SkImageInfo info = codec->getInfo().makeColorType(fColorType);
     SkBitmap bitmap;
     if (!bitmap.tryAllocPixels(info)) {
         return SkStringPrintf("Image(%s) is too large (%d x %d)", fPath.c_str(),
@@ -870,11 +875,16 @@
     }
 
     SkImageInfo decodeInfo = info;
-    if (kBaseline_Mode != fMode) {
+    size_t srcRowBytes = sizeof(SkPMColor) * info.width();
+    SkAutoMalloc src(srcRowBytes * info.height());
+    void* srcPixels = src.get();
+    if (kBaseline_Mode == fMode) {
+        srcPixels = bitmap.getPixels();
+    } else {
         decodeInfo = decodeInfo.makeColorType(kRGBA_8888_SkColorType);
     }
 
-    SkCodec::Result r = codec->getPixels(decodeInfo, bitmap.getPixels(), bitmap.rowBytes());
+    SkCodec::Result r = codec->getPixels(decodeInfo, srcPixels, srcRowBytes);
     if (SkCodec::kSuccess != r) {
         return SkStringPrintf("Couldn't getPixels %s. Error code %d", fPath.c_str(), r);
     }
@@ -903,10 +913,24 @@
                 return "Unimplemented color conversion.";
             }
 
-            uint32_t* row = (uint32_t*) bitmap.getPixels();
-            for (int y = 0; y < info.height(); y++) {
-                xform->xform_RGB1_8888(row, row, info.width());
-                row = SkTAddOffset<uint32_t>(row, bitmap.rowBytes());
+            if (kN32_SkColorType == fColorType) {
+                uint32_t* srcRow = (uint32_t*) srcPixels;
+                uint32_t* dstRow = (uint32_t*) bitmap.getPixels();
+                for (int y = 0; y < info.height(); y++) {
+                    xform->applyTo8888(dstRow, srcRow, info.width());
+                    srcRow = SkTAddOffset<uint32_t>(srcRow, srcRowBytes);
+                    dstRow = SkTAddOffset<uint32_t>(dstRow, bitmap.rowBytes());
+                }
+            } else {
+                SkASSERT(kRGBA_F16_SkColorType == fColorType);
+
+                uint32_t* srcRow = (uint32_t*) srcPixels;
+                uint64_t* dstRow = (uint64_t*) bitmap.getPixels();
+                for (int y = 0; y < info.height(); y++) {
+                    xform->applyToF16(dstRow, srcRow, info.width());
+                    srcRow = SkTAddOffset<uint32_t>(srcRow, srcRowBytes);
+                    dstRow = SkTAddOffset<uint64_t>(dstRow, bitmap.rowBytes());
+                }
             }
 
             canvas->drawBitmap(bitmap, 0, 0);
@@ -943,10 +967,12 @@
 #endif
 
             // Perform color correction.
-            uint32_t* row = (uint32_t*) bitmap.getPixels();
+            uint32_t* srcRow = (uint32_t*) srcPixels;
+            uint32_t* dstRow = (uint32_t*) bitmap.getPixels();
             for (int y = 0; y < info.height(); y++) {
-                qcms_transform_data_type(transform, row, row, info.width(), outType);
-                row = SkTAddOffset<uint32_t>(row, bitmap.rowBytes());
+                qcms_transform_data_type(transform, srcRow, dstRow, info.width(), outType);
+                srcRow = SkTAddOffset<uint32_t>(srcRow, srcRowBytes);
+                dstRow = SkTAddOffset<uint32_t>(dstRow, bitmap.rowBytes());
             }
 
             canvas->drawBitmap(bitmap, 0, 0);