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
+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 {
 
+const char* SkStringExtension(const SkString& string) {
+    int index = string.findLastOf('.');
+    if (index >= 0 && (size_t) ++index < string.size()) {
+        return &string.c_str()[index];
+    }
+    return "";
+}
+
 GMSrc::GMSrc(skiagm::GMRegistry::Factory factory) : fFactory(factory) {}
 
 Error GMSrc::draw(SkCanvas* canvas) const {
     SkAutoTDelete<skiagm::GM> gm(fFactory(nullptr));
     canvas->concat(gm->getInitialTransform());
     gm->draw(canvas);
     return "";
 }
 
 SkISize GMSrc::size() const {
@@ skipping 537 matching lines @@
     return codec->getScaledDimensions(fScale);
 }
 
 Name CodecSrc::name() const {
     if (1.0f == fScale) {
         return SkOSPath::Basename(fPath.c_str());
     }
     return get_scaled_name(fPath, fScale);
 }
 
+int CodecSrc::enclave() const {

[msarett, 2016/02/08 19:35:37]

I think AndroidCodecSrc should also override enclave()?

[scroggo, 2016/02/08 20:08:12]

Yep. That's at least partially responsible for my trybot failures...

And I also decided to move this work into the constructor, since this method
will be called once for each sink.

+#ifdef SK_CODEC_DECODES_RAW

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

Why #ifdef?  Doesn't the actual logic you wrote still hold true?

+    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 = SkStringExtension(fPath);
+        for (auto* ext : exts) {
+            if (0 == strcmp(ext, actualExt)) {
+                return kRAW_Enclave;
+            }
+        }
+    }
+#endif
+    return kAnyThread_Enclave;
+}
+
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 AndroidCodecSrc::AndroidCodecSrc(Path path, Mode mode, CodecSrc::DstColorType dstColorType,
         SkAlphaType dstAlphaType, int sampleSize)
     : fPath(path)
     , fMode(mode)
     , fDstColorType(dstColorType)
     , fDstAlphaType(dstAlphaType)
     , fSampleSize(sampleSize)
 {}
@@ skipping 774 matching lines @@
             skr.visit<void>(i, drawsAsSingletonPictures);
         }
         SkAutoTUnref<SkPicture> macroPic(macroRec.endRecordingAsPicture());
 
         canvas->drawPicture(macroPic);
         return check_against_reference(bitmap, src, fSink);
     });
 }
 
 }  // namespace DM