Use SkSwizzler to convert from CMYK

Use SkSwizzler to convert from CMYK

Move convert_CMYK_to_RGBA into two functions in SkSwizzler: one for 565
and one for 8888.

For simplicity, when converting to 8888, we no longer convert in place.

BUG=skia:4476
Committed: https://skia.googlesource.com/skia/+/450ee8f26d39f975cf6af37a27de658ae5a9fa10

Committed: https://skia.googlesource.com/skia/+/ef27d89b076ce7ab81703c9c08ce1f5c44106ee6

[scroggo_chromium, 2015-10-23 14:03:39]

scroggo@chromium.org changed reviewers:
+ msarett@google.com

[msarett, 2015-10-23 14:25:42]

"For simplicity, when converting to 8888, we no longer convert in place."

Do you think this will have a performance impact?  No need to get numbers, I'm
just curious what you think.

https://codereview.chromium.org/1411083009/diff/20001/src/codec/SkSwizzler.cpp
File src/codec/SkSwizzler.cpp (right):

https://codereview.chromium.org/1411083009/diff/20001/src/codec/SkSwizzler.cp...
src/codec/SkSwizzler.cpp:536: #if defined(SK_PMCOLOR_IS_RGBA)
Can we use SkPackARGB32NoCheck here instead of #if?

[scroggo_chromium, 2015-10-23 14:35:36]

On 2015/10/23 14:25:42, msarett wrote:
> "For simplicity, when converting to 8888, we no longer convert in place."
> 
> Do you think this will have a performance impact?  No need to get numbers, I'm
> just curious what you think.

It certainly could, particularly on really wide images. I recall when Emmalee
first started using the swizzler in jpeg, it slowed things down. It turned out
the bulk of the slowdown was from the allocation of memory for the temporary
pre-swizzled/sampled scanline. Further, there was a bug where we were allocating
too much memory - reducing that to the amount we needed made a big difference.

So it's an extra memory allocation, which could be expensive for a really wide
image.

https://codereview.chromium.org/1411083009/diff/20001/src/codec/SkSwizzler.cpp
File src/codec/SkSwizzler.cpp (right):

https://codereview.chromium.org/1411083009/diff/20001/src/codec/SkSwizzler.cp...
src/codec/SkSwizzler.cpp:536: #if defined(SK_PMCOLOR_IS_RGBA)
On 2015/10/23 14:25:42, msarett wrote:
> Can we use SkPackARGB32NoCheck here instead of #if?

Yes! I was just copying code, but this is much cleaner.

[msarett, 2015-10-23 14:38:08]

lgtm

[scroggo_chromium, 2015-10-23 14:40:41]

The CQ bit was checked by scroggo@chromium.org

[commit-bot: I haz the power, 2015-10-23 14:40:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1411083009/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1411083009/40001

[commit-bot: I haz the power, 2015-10-23 14:44:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-10-23 14:44:18]

Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[scroggo, 2015-10-23 14:49:33]

The CQ bit was checked by scroggo@google.com

[scroggo, 2015-10-23 14:49:34]

The patchset sent to the CQ was uploaded after l-g-t-m from msarett@google.com
Link to the patchset: https://codereview.chromium.org/1411083009/#ps60001
(title: "Update test now that CMYK supports 565")

[commit-bot: I haz the power, 2015-10-23 14:49:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1411083009/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1411083009/60001

[commit-bot: I haz the power, 2015-10-23 15:01:09]

Committed patchset #4 (id:60001) as
https://skia.googlesource.com/skia/+/450ee8f26d39f975cf6af37a27de658ae5a9fa10

[scroggo, 2015-10-23 15:39:45]

A revert of this CL (patchset #4 id:60001) has been created in
https://codereview.chromium.org/1411193006/ by scroggo@google.com.

The reason for reverting is: Breaking ASAN. See
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2....

[scroggo_chromium, 2015-10-23 16:07:34]

Description was changed from

==========
Use SkSwizzler to convert from CMYK

Move convert_CMYK_to_RGBA into two functions in SkSwizzler: one for 565
and one for 8888.

For simplicity, when converting to 8888, we no longer convert in place.

BUG=skia:4476

Committed:
https://skia.googlesource.com/skia/+/450ee8f26d39f975cf6af37a27de658ae5a9fa10
==========

to

==========
Use SkSwizzler to convert from CMYK

Move convert_CMYK_to_RGBA into two functions in SkSwizzler: one for 565
and one for 8888.

For simplicity, when converting to 8888, we no longer convert in place.

BUG=skia:4476

Committed:
https://skia.googlesource.com/skia/+/450ee8f26d39f975cf6af37a27de658ae5a9fa10
==========

[scroggo_chromium, 2015-10-23 16:07:53]

On 2015/10/23 15:39:45, scroggo wrote:
> A revert of this CL (patchset #4 id:60001) has been created in
> https://codereview.chromium.org/1411193006/ by mailto:scroggo@google.com.
> 
> The reason for reverting is: Breaking ASAN. See
>
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2....

PTAL. Break statement added in.

[msarett, 2015-10-23 16:11:45]

lgtm

[scroggo, 2015-10-23 16:17:05]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2015-10-23 16:17:08]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1411083009/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1411083009/80001

[scroggo_chromium, 2015-10-23 16:18:03]

The CQ bit was unchecked by scroggo@chromium.org

[scroggo_chromium, 2015-10-23 16:18:59]

The CQ bit was checked by scroggo@chromium.org

[commit-bot: I haz the power, 2015-10-23 16:19:09]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1411083009/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1411083009/80001

[commit-bot: I haz the power, 2015-10-23 16:29:25]

Committed patchset #5 (id:80001) as
https://skia.googlesource.com/skia/+/ef27d89b076ce7ab81703c9c08ce1f5c44106ee6