Updates the gyp file.

src/codec/SkRawCodec.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 "SkCodec.h"
+#include "SkRawCodec.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkStream.h"
+#include "SkTemplates.h"
+#include "SkTypes.h"
+#include "SkSwizzler.h"
+
+#include "dng_color_space.h"
+#include "dng_exceptions.h"
+#include "dng_host.h"
+#include "dng_info.h"
+#include "dng_render.h"
+
+namespace {
+
+class DngStream : public dng_stream {
+ public:

[scroggo, 2015/11/19 22:16:54]

Skia uses four space indents (I probably should have pointed you at our style
guide: https://skia.org/dev/contrib/style).

[ebrauer, 2015/11/20 11:43:44]

Done.

+  explicit DngStream(SkStream* stream) : data_(stream->getMemoryBase()),

[scroggo, 2015/11/19 22:16:54]

This is in the style guide, but this should look like:

explicit DngStream(SkStream* stream)
    : fData(stream->getMemoryBase()
    , fDataSize(stream->getLength()) {}

More importantly, this will not work for all streams. getMemoryBase is only
implemented for a couple of subclasses, and getLength is not supported by Java
streams (see b/8432093). We've removed all of our decoders' dependencies on it.
If you actually *need* all of the data, you should copy it all from the stream
if it's not already available (e.g. using SkCopyStreamToStorage in
https://skia.googlesource.com/skia/+/master/src/core/SkStreamPriv.h). But that's
dangerous, too. We have found that reading the entire stream can use too much
memory (I thought we had an open bug for this, but I'm not sure where...).
SkCodec is a replacement for an older image decoding class, and it was a
deliberate choice in SkCodec to never rely on storing all the data if we can
help it. It seems like this would be an even bigger concern with a RAW image,
which is not compressed, IIUC.

[ebrauer, 2015/11/20 11:43:44]

Got it. I suppose the stream is read-forward only (like in Java)? Is it possible
to have a buffered stream or do I need to buffer the data on the fly to enable
us to read the data in random order?

[scroggo, 2015/11/20 21:22:37]

I'm not sure what you mean by "is it possible to have a buffered stream". From
the Java API, there is a BufferedStream, but it does not give you random access
(just reset, which rewinds to a mark, but only if less than the buffer has been
read). We *could* supply you a buffered stream, but the other classes do not
generally need it, so I would recommend you do your own buffering.

[scroggo, 2015/12/18 15:51:05]

More to the point - the stream may actually *be* a Java stream, which yes, is
read-forward only.

+      data_size_(stream->getLength()) {}
+  ~DngStream() override {}
+
+ protected:
+  uint64 DoGetLength() override { return data_size_; }
+  void DoRead(void* data, uint32 count, uint64 offset) override {
+    if (data_size_ < offset + count) {
+      ThrowReadFile();

[scroggo, 2015/11/19 22:16:54]

The rest of Skia does not use exceptions. Can we avoid them here?

[ebrauer, 2015/11/20 11:43:44]

The dng sdk uses them quite often. I don't see a good solution to this.

+    }
+
+    std::memcpy(data, reinterpret_cast<const uint8*>(data_) + offset, count);

[scroggo, 2015/11/19 22:16:54]

Are you calling a particular version of memcpy? Everywhere else in Skia we just
call "memcpy".

[ebrauer, 2015/11/20 11:43:44]

Done.

+  }
+
+ private:
+  const void* data_;
+  size_t data_size_;
+};
+
+bool IsDng(SkStream* data) {
+  try {
+    DngStream stream(data);
+    dng_host host;
+    dng_info info;
+    info.Parse(host, stream);
+    info.PostParse(host);
+    return info.IsValidDNG();
+  } catch (...) {  // Handle all kinds of exceptions as "false".
+    return false;
+  }
+}
+
+bool ReadDng(dng_stream* stream, dng_host* host, dng_info* info, 
+             std::unique_ptr<dng_negative>* negative) {

[scroggo, 2015/11/19 22:16:54]

For historical reasons, Skia does not use unique_ptr directly. Our equivalent is
SkAutoTDelete.

Can you just return a dng_negative instead, though? I'm guessing if you return
false, the client will not want the dng_negative.

+  const uint32 kPreferredSize = 0;
+  const uint32 kMinimumSize = 0;
+  const uint32 kMaximumSize = 0;
+  try {
+    host->SetPreferredSize(kPreferredSize);
+    host->SetMinimumSize(kMinimumSize);
+    host->SetMaximumSize(kMaximumSize);
+
+    host->ValidateSizes();
+
+    // Read stage 1 image into the negative.
+    {
+      info->Parse(*host, *stream);
+      info->PostParse(*host);
+
+      if (!info->IsValidDNG()) {
+        return false;
+      }
+
+      negative->reset(host->Make_dng_negative());
+      (*negative)->Parse(*host, *stream, *info);
+      (*negative)->PostParse(*host, *stream, *info);
+    }
+
+    (*negative)->SynchronizeMetadata();
+  } catch (const dng_exception& exception) {
+    return false;
+  } catch (...) {  // Following the example from dng_validate.cc we also catch
+    // at this point.
+    return false;
+  }
+
+  return true;
+}
+
+bool PrepareStage3(dng_stream* stream, dng_host* host, dng_info* info,
+                   dng_negative* negative) {
+  if (negative->Stage3Image() == nullptr) {
+    negative->ReadStage1Image(*host, *stream, *info);
+
+    if (info->fMaskIndex != -1) {
+      negative->ReadTransparencyMask(*host, *stream, *info);
+    }
+
+    negative->ValidateRawImageDigest(*host);
+    if (negative->IsDamaged()) {
+      return false;
+    }
+
+    const int32 kMosaicPlane = -1;
+    negative->BuildStage2Image(*host);
+    negative->BuildStage3Image(*host, kMosaicPlane);
+  }
+
+  return true;
+}
+
+}  // namespace
+
+bool SkRawCodec::IsRaw(SkStream* stream) {
+  return IsDng(stream);
+}
+
+SkCodec* SkRawCodec::NewFromStream(SkStream* data) {
+  DngStream stream(data);
+  dng_host host;
+  dng_info info;
+  std::unique_ptr<dng_negative> negative;
+  if (!ReadDng(&stream, &host, &info, &negative) &&
+      !PrepareStage3(&stream, &host, &info, negative.get())) {
+    return nullptr;
+  }
+  const SkImageInfo& imageInfo = SkImageInfo::Make(
+      negative->DefaultCropSizeH().As_real64(),
+      negative->DefaultCropSizeV().As_real64(), kRGBA_8888_SkColorType,
+      kOpaque_SkAlphaType);
+  return new SkRawCodec(imageInfo, data);
+}
+
+SkCodec::Result SkRawCodec::onGetPixels(const SkImageInfo& requestedInfo, void* dst,
+                                        size_t dstRowBytes, const Options& options,
+                                        SkPMColor ctable[], int* ctableCount,
+                                        int* rowsDecoded) {
+  const int width = requestedInfo.width();
+  const int height = requestedInfo.height();
+  std::unique_ptr<dng_image> final_dng_image;
+  try {
+    DngStream stream(this->stream());
+    dng_host host;
+    dng_info info;
+    std::unique_ptr<dng_negative> negative;
+    if (!ReadDng(&stream, &host, &info, &negative) ||
+        !PrepareStage3(&stream, &host, &info, negative.get())) {
+      return kInvalidInput;
+    }
+
+    dng_render render(host, *negative);
+    render.SetFinalSpace(dng_space_sRGB::Get());
+    render.SetFinalPixelType(ttByte);
+
+    final_dng_image.reset(render.Render());
+  } catch (const dng_exception& exception) {
+    return kInvalidInput;
+  } catch (...) {  
+    return kInvalidInput;
+  }
+
+  void* dst_row = dst;
+  //uint8 src_row[width * 3];
+  //const SkPMColor color = SkPreMultiplyColor(0xFFFFFFFF);
+  /*std::unique_ptr<SkSwizzler> swizzler(SkSwizzler::CreateSwizzler(
+      SkSwizzler::kRGB, nullptr, requestedInfo, options));*/
+  for (int i = 0; i < height - 1; ++i) {
+    dng_pixel_buffer buffer;
+    buffer.fData = dst_row;
+    buffer.fArea = dng_rect(i, 0, i + 1, width);
+    buffer.fPlane = 0;
+    buffer.fPlanes = 4;
+    buffer.fColStep = buffer.fPlanes;
+    buffer.fPlaneStep = 1;
+    buffer.fPixelType = ttByte;
+    buffer.fPixelSize = sizeof(uint8);
+    buffer.fRowStep = dstRowBytes;
+    final_dng_image->Get(buffer, dng_image::edge_zero);
+    //swizzler->swizzle(dst_row, &src_row[0]);

[msarett, 2015/11/19 16:45:01]

What is your question about the swizzler here?  It looks like you have
everything set up properly.

The swizzler can convert to the SkColorType specified in requestedInfo for you. 
However, there may be a performance benefit if the dng library can convert
directly.

The SkSwizzler::SrcConfig tells the swizzler the format of the src.  It looks
like above you are indicating that the source is RGBRGBRGB...  The swizzler can
convert that BGRA, RGBA, 565, depending on the request.  Those are the color
types that I think it makes sense to support.

[ebrauer, 2015/11/19 16:58:47]

One of my problems here is that the code crashes using swizzler. Does my color
setup on creation make sense? Can I just pass it nullptr?

[scroggo, 2015/11/19 22:16:55]

Yes, you can pass nullptr for the SkPMColor* parameter. It is not needed for a
source of kRGB.

I'm guessing some other code is left out though. I see a commented out
definition of src_row, but it appears to have no data in it?

Where is the crash?

[ebrauer, 2015/11/20 11:43:44]

The crash happens in the swizzle call giving me a core dump.

[ebrauer, 2015/11/20 12:57:57]

Again my fault. I must not use swizzler when the object was not created.

[scroggo, 2015/11/20 21:22:37]

The swizzler was not created? That may mean we need to add support for some kind
of conversion. I can help if you let me know why the swizzler creation failed.

+    dst_row = SkTAddOffset<void>(dst_row, dstRowBytes);
+  }
+  return kSuccess;
+}
+
+SkRawCodec::SkRawCodec(const SkImageInfo& srcInfo, SkStream* stream)
+    : INHERITED(srcInfo, stream) {}
+