Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Unified Diff: src/codec/SkAndroidCodec.cpp

Issue 1520403003: Prototype of RAW decoding in Skia. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: * Add DNG scaling. * Adress all comments. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/codec/SkAndroidCodec.cpp
diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp
index d309d58501a80004c573e2dcbc39d440967a4f85..34830969a17d131533addbfb1e68aab0c04486b4 100644
--- a/src/codec/SkAndroidCodec.cpp
+++ b/src/codec/SkAndroidCodec.cpp
@@ -8,6 +8,9 @@
#include "SkAndroidCodec.h"
#include "SkCodec.h"
#include "SkCodecPriv.h"
+#ifdef SK_CODEC_DECODES_RAW
+#include "SkRawAdapterCodec.h"
+#endif
#include "SkSampledCodec.h"
#include "SkWebpAdapterCodec.h"
@@ -17,9 +20,7 @@ static bool is_valid_sample_size(int sampleSize) {
}
SkAndroidCodec::SkAndroidCodec(SkCodec* codec)
- : fInfo(codec->getInfo())
- , fCodec(codec)
-{}
+ : fInfo(codec->getInfo()), fCodec(codec) {}
SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader* chunkReader) {
SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream, chunkReader));
@@ -37,6 +38,10 @@ SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader
case kGIF_SkEncodedFormat:
case kICO_SkEncodedFormat:
return new SkSampledCodec(codec.detach());
+#ifdef SK_CODEC_DECODES_RAW
+ case kRAW_SkEncodedFormat:
+ return new SkRawAdapterCodec((SkRawCodec*)codec.detach());
+#endif
default:
return nullptr;
}
@@ -182,3 +187,4 @@ SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void*
size_t rowBytes) {
return this->getAndroidPixels(info, pixels, rowBytes, nullptr);
}
+
« no previous file with comments | « resources/sample_1mp.dng ('k') | src/codec/SkCodec.cpp » ('j') | src/codec/SkRawAdapterCodec.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698