Optionally run RAW images serially

dm/DMSrcSink.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "DMSrcSink.h"
 #include "SkAndroidCodec.h"
 #include "SkCodec.h"
@@ skipping 20 matching lines @@
 #include "SkXMLWriter.h"
 #include "SkSwizzler.h"
 #include <functional>
 
 #ifdef SK_MOJO
     #include "SkMojo.mojom.h"
 #endif
 
 DEFINE_bool(multiPage, false, "For document-type backends, render the source"
             " into multiple pages");
+#ifdef SK_CODEC_DECODES_RAW

[mtklein, 2016/02/08 21:26:55]

Doesn't need an ifdef?

[scroggo, 2016/02/08 21:31:30]

Not needed, but I think it makes sense. If it's not defined, this FLAG doesn't
make a difference. So it seems unnecessary to include it as an option. But I
don't feel strongly on that one. (We do not use the guard around gpu_threading,
which is similar.)

[mtklein, 2016/02/08 21:45:47]

Please no ifdefs that don't strictly matter.

[scroggo, 2016/02/08 21:47:48]

Done.

+DEFINE_bool(RAW_threading, true, "Allow RAW decodes to run on multiple threads?");
+#endif
 
 static bool lazy_decode_bitmap(const void* src, size_t size, SkBitmap* dst) {
     SkAutoTUnref<SkData> encoded(SkData::NewWithCopy(src, size));
     return encoded && SkDEPRECATED_InstallDiscardablePixelRef(encoded, dst);
 }
 
 namespace DM {
 
 GMSrc::GMSrc(skiagm::GMRegistry::Factory factory) : fFactory(factory) {}
 
@@ skipping 180 matching lines @@
     // We will replicate the names used by CodecSrc so that images can
     // be compared in Gold.
     if (1 == fSampleSize) {
         return SkOSPath::Basename(fPath.c_str());
     }
     return get_scaled_name(fPath, 1.0f / (float) fSampleSize);
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
+static bool serial_from_path_name(const SkString& path) {
+#ifdef SK_CODEC_DECODES_RAW

[mtklein, 2016/02/08 21:26:55]

Doesn't need an ifdef?

[scroggo, 2016/02/08 21:31:30]

This ifdef isn't strictly necessary, but it skips wasted work (checking every
file extension) when the ultimate outcome is going to be return false always.

[mtklein, 2016/02/08 21:45:47]

Ditto.

(We're not allowed to pretend we're optimizing code unless we actually measure
it.)

[scroggo, 2016/02/08 21:47:48]

Done.

+    if (!FLAGS_RAW_threading) {
+        static const char* const exts[] = {
+            "arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
+            "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW",
+        };
+        const char* actualExt = strrchr(path.c_str(), '.');
+        if (actualExt) {
+            actualExt++;
+            for (auto* ext : exts) {
+                if (0 == strcmp(ext, actualExt)) {
+                    return true;
+                }
+            }
+        }
+    }
+#endif
+    return false;
+}
+
 CodecSrc::CodecSrc(Path path, Mode mode, DstColorType dstColorType, SkAlphaType dstAlphaType,
                    float scale)
     : fPath(path)
     , fMode(mode)
     , fDstColorType(dstColorType)
     , fDstAlphaType(dstAlphaType)
     , fScale(scale)
+    , fRunSerially(serial_from_path_name(path))
 {}
 
 bool CodecSrc::veto(SinkFlags flags) const {
     // Test CodecImageGenerator on 8888, 565, and gpu
     if (kGen_Mode == fMode) {
         return (flags.type != SinkFlags::kRaster || flags.approach != SinkFlags::kDirect) &&
                 flags.type != SinkFlags::kGPU;
     }
 
     // Test all other modes to direct raster backends (8888 and 565).
@@ skipping 347 matching lines @@
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 AndroidCodecSrc::AndroidCodecSrc(Path path, Mode mode, CodecSrc::DstColorType dstColorType,
         SkAlphaType dstAlphaType, int sampleSize)
     : fPath(path)
     , fMode(mode)
     , fDstColorType(dstColorType)
     , fDstAlphaType(dstAlphaType)
     , fSampleSize(sampleSize)
+    , fRunSerially(serial_from_path_name(path))
 {}
 
 bool AndroidCodecSrc::veto(SinkFlags flags) const {
     // No need to test decoding to non-raster or indirect backend.
     return flags.type != SinkFlags::kRaster
         || flags.approach != SinkFlags::kDirect;
 }
 
 Error AndroidCodecSrc::draw(SkCanvas* canvas) const {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
@@ skipping 761 matching lines @@
             skr.visit<void>(i, drawsAsSingletonPictures);
         }
         SkAutoTUnref<SkPicture> macroPic(macroRec.endRecordingAsPicture());
 
         canvas->drawPicture(macroPic);
         return check_against_reference(bitmap, src, fSink);
     });
 }
 
 }  // namespace DM