366214 - Followon for 325906 and some more improvements for JPEG in Cairo

Status: VERIFIED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Alfred Kayser]

Attachment: Patch to remove warnings and some optimize Jpg in Cairo

Comment 1

[Alfred Kayser]

Patch description:

1. Use row_stride and bpr only in non-Cairo builds (for the RGBRow buffer)
   (as jpg scanlines are always 3 bytes (in current config anyway)
2. Use 'client_data' to keep the pointer to the decoder instead of the offsetof hack
3. Call 'img->ImageUpdated' not for every scanline, but for every batch of scanlines received (just like OnDataAvailable).

Ad 1: Allows for better Cairo and non-Cairo separation
Ad 2: Removes the need for the offsetof hack
Ad 3: Makes image decoding for JPG in Cairo a lot faster (at least it feels faster)

Comment 2

[Phil Ringnalda (:philor)]

(Betting you didn't mean to assign to [e-mail])

Comment 3

[Stuart Parmenter]

Comment on attachment 250745 [details] [diff] [review]
Patch to remove warnings and some optimize Jpg in Cairo

this looks good.  the non-cairo code can also be removed at this point but may want to do that in a separate patch.

Comment 4

[tor]

Comment on attachment 250745 [details] [diff] [review]
Patch to remove warnings and some optimize Jpg in Cairo

> nsJPEGDecoder::OutputScanlines()
> {
...
> #if defined(MOZ_CAIRO_GFX)
...
>+#else
>+  // Note! row_stride here must match the row_stride in
>+  // nsJPEGDecoder::WriteFrom
>+#if defined(MOZ_CAIRO_GFX) || defined(XP_MAC) || defined(XP_MACOSX)

This test is inside a !defined(MOZ_CAIRO_GFX) chunk, so remove the first condition.  With that, sr=tor.

Comment 5

[Alfred Kayser]

Who can do the checkin for me?

Comment 6

[Nickolay_Ponomarev]

Attachment: what was checked in

Please diff from mozilla/ so it's easier to apply your patches. Also attaching the diff with comments addressed would be appreciated.

Checked in with tor's comment fixed.

modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp  1.69
modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h    1.24