Revert "Add SkJpegGainmapEncoder::EncodeJpegR and EncodeHDRGM"
This reverts commit c4b171fe5668a522c222b0777afefcb3cbd8a2ac.
Reason for revert: This appears to be causing failures within Android since they are using a constructor which changed. We may just need to have them update things on their end, but for now I am going to try reverting this to unblock the roller.
Original change's description:
> Add SkJpegGainmapEncoder::EncodeJpegR and EncodeHDRGM
>
> Add a SkJpegGainmapEncoder class that is a friend of SkJpegEncoder and
> add the functions SkJpegGainmapEncoder::EncodeJpegR and EncodeHDRGM.
>
> This requires adding two new pieces of data to the SkJpegEncoder.
> First is a list of new segments. For both JpegR and HDRGM, this
> includes the XMP metadata. For HDRM this includes segments for the
> encoded gainmap image. Second is a "suffix" to append to the end of
> the base image. For JpegR, this is the encoded gainmap image.
>
> Send the new segments to jpeg_write_marker (just like is currently
> done for the ICC profile).
>
> Plumb the "suffix" through to the skjpeg_destination_mgr, to be
> appended after image is done writing (but before the stream is
> flushed).
>
> In both EncodeJpegR and EncodeHDRGM function, hard-code the XMP
> metadata string (rather than constructing and serializing an SkDOM).
>
> Include the math to transcode from any gainmap representation to
> JpegR.
>
> Add a test that transcodes an MPF gainmap image to a JpegR and
> HDRGM image, and ensures that the rendered results are the same (up
> to rounding error).
>
> Bug: skia:14031
> Change-Id: I7222fba2770da050cddd46f10c139b4d33db20cc
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/631103
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Christopher Cameron <ccameron@google.com>
Bug: skia:14031
Change-Id: I36fd38a1d644b0374ef423c58d990f6081a4f149
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/633982
Commit-Queue: Nolan Scobie <nscobie@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Nolan Scobie <nscobie@google.com>
Auto-Submit: Nicolette Prevost <nicolettep@google.com>
8 files changed