diff options
author | msarett <msarett@google.com> | 2016-04-20 11:53:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-20 11:53:35 -0700 |
commit | c30c418f4eb75f365c7d7a32d5419b41ca780ba8 (patch) | |
tree | d9e5a2dacd55f32f51319fbc22fa3335081e6940 /src/codec/SkJpegDecoderMgr.cpp | |
parent | 3e302275b324172c845627cbd00cee8a06571baf (diff) |
Add SkEncodedInfo to report properties of encoded image data
All this does is build an SkEncodedInfo for each codec, and
then convert it to an SkImageInfo.
In future steps I intend to:
(1) Use SkEncodedInfo in place of SrcConfig in SkSwizzler.
(2) Support more conversions in SkSwizzler (non-native
BGRA/RGBA, 16-bit components, float, fixed point)
(3) Investigate optimizing conversions from encoded data
to linear color spaces.
BUG=skia:4133
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1820073002
Committed: https://skia.googlesource.com/skia/+/f682d9ad70d690a343bc15e26ef321d86770be41
Review URL: https://codereview.chromium.org/1820073002
Diffstat (limited to 'src/codec/SkJpegDecoderMgr.cpp')
-rw-r--r-- | src/codec/SkJpegDecoderMgr.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp index 63228bb585..8517e0dac2 100644 --- a/src/codec/SkJpegDecoderMgr.cpp +++ b/src/codec/SkJpegDecoderMgr.cpp @@ -35,12 +35,20 @@ SkCodec::Result JpegDecoderMgr::returnFailure(const char caller[], SkCodec::Resu return result; } -SkColorType JpegDecoderMgr::getColorType() { +SkEncodedInfo::Color JpegDecoderMgr::getEncodedColor() { switch (fDInfo.jpeg_color_space) { case JCS_GRAYSCALE: - return kGray_8_SkColorType; + return SkEncodedInfo::kGray_Color; + case JCS_YCbCr: + return SkEncodedInfo::kYUV_Color; + case JCS_RGB: + return SkEncodedInfo::kRGB_Color; + case JCS_YCCK: + return SkEncodedInfo::kYCCK_Color; + case JCS_CMYK: + return SkEncodedInfo::kInvertedCMYK_Color; default: - return kN32_SkColorType; + return SkEncodedInfo::kUnknown_Color; } } |