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

Issue 2026383002: Revert of Make SkPngCodec decode progressively. (Closed)

Created:
4 years, 6 months ago by scroggo
Modified:
4 years, 6 months ago
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@foil
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Revert of Make SkPngCodec decode progressively. (patchset #24 id:480001 of https://codereview.chromium.org/1997703003/ ) Reason for revert: Still breaking Google3 e.g.: https://sponge.corp.google.com/target?id=9261d31b-34fc-4f0f-981e-f92f7c5cea2c&target=//third_party/skia/HEAD:dm#shard=1|run=1|attempt=1|page=-1 https://test.corp.google.com/ui#cl=123773095&flags=CAMQBQ==&id=OCL:123773095:BASE:123773415:1464804876959:b0ea9b1c&t=//third_party/skia/HEAD:dm Original issue's description: > Make SkPngCodec decode progressively. > > This is a step towards using SkCodec in Chromium, where progressive > decoding is necessary. > > Switch from using png_read_row (which expects all the data to be > available) to png_process_data, which uses callbacks when rows are > available. > > Create a new API for SkCodec, which supports progressive decoding and > scanline decoding. Future changes will switch the other clients off of > startScanlineDecode and get/skip-Scanlines to the new API. > > Remove SkCodec::kNone_ScanlineOrder, which was only used for interlaced > PNG images. In the new API, interlaced PNG fits kTopDown. Also remove > updateCurrScanline(), which was only used by the old implementation for > interlaced PNG. > > DMSrcSink: > - In CodecSrc::kScanline_Mode, use the new method for scanline decoding > for the supported formats (just PNG and PNG-in-ICO for now). > > fuzz.cpp: > - Remove reference to kNone_ScanlineOrder > > SkCodec: > - Add new APIs: > - startIncrementalDecode > - incrementalDecode > - Remove kNone_SkScanlineOrder and updateCurrScanline() > > SkPngCodec: > - Implement new APIs > - Switch from sk_read_fn/png_read_row etc to png_process_data > - Expand AutoCleanPng's role to decode the header and create the > SkPngCodec > - Make the interlaced PNG decoder report how many lines were > initialized during an incomplete decode > - Make initializeSwizzler return a bool instead of an SkCodec::Result > (It only returned kSuccess or kInvalidInput anyway) > > SkIcoCodec: > - Implement the new APIs; supported for PNG in ICO > > SkSampledCodec: > - Call the new method for decoding scanlines, and fall back to the old > method if the new version is unimplemented > - Remove references to kNone_SkScanlineOrder > > tests/CodecPartial: > - Add a test which decodes part of an image, then finishes the decode, > and compares it to the straightforward method > > tests/CodecTest: > - Add a test which decodes all scanlines using the new method > - Repurpose the Codec_stripes test to decode using the new method in > sections rather than all at once > - In the method check(), add a parameter for whether the image supports > the new method of scanline decoding, and be explicit about whether an > image supports incomplete > - Test incomplete PNG decodes. We should have been doing it anyway for > non-interlaced (except for an image that is too small - one row), but > the new method supports interlaced incomplete as well > - Make test_invalid_parameters test the new method > - Add a test to ensure that it's safe to fall back to scanline decoding without > rewinding > > BUG=skia:4211 > > The new version was generally faster than the old version (but not significantly so). > > Some raw performance differences can be found at https://docs.google.com/a/google.com/spreadsheets/d/1Gis3aRCEa72qBNDRMgGDg3jD-pMgO-FXldlNF9ejo4o/ > > Design doc can be found at https://docs.google.com/a/google.com/document/d/11Mn8-ePDKwVEMCjs3nWwSjxcSpJ_Cu8DF57KNtUmgLM/ > > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1997703003 > > Committed: https://skia.googlesource.com/skia/+/a4b09a117d4d1ba5dda372e6a2323e653766539e > > Committed: https://skia.googlesource.com/skia/+/30e78c9737ff4861dc4e3fa1e4cd010680ed6965 TBR=reed@google.com,msarett@google.com,scroggo@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4211 Committed: https://skia.googlesource.com/skia/+/26694c32d2a7a511bb2832204bb7759219b9d7bc

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+631 lines, -1357 lines) Patch
M dm/DMSrcSink.cpp View 1 chunk +22 lines, -46 lines 0 comments Download
M fuzz/fuzz.cpp View 1 chunk +1 line, -0 lines 0 comments Download
M gm/factory.cpp View 1 chunk +3 lines, -2 lines 0 comments Download
M include/codec/SkCodec.h View 8 chunks +18 lines, -79 lines 0 comments Download
M src/codec/SkCodec.cpp View 6 chunks +37 lines, -96 lines 0 comments Download
M src/codec/SkGifCodec.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/codec/SkIcoCodec.h View 2 chunks +0 lines, -13 lines 0 comments Download
M src/codec/SkIcoCodec.cpp View 3 chunks +5 lines, -76 lines 0 comments Download
M src/codec/SkPngCodec.h View 2 chunks +9 lines, -24 lines 0 comments Download
M src/codec/SkPngCodec.cpp View 15 chunks +323 lines, -463 lines 0 comments Download
M src/codec/SkSampledCodec.cpp View 3 chunks +64 lines, -120 lines 0 comments Download
M src/codec/SkSampler.h View 2 chunks +0 lines, -29 lines 0 comments Download
D tests/CodecPartial.cpp View 1 chunk +0 lines, -155 lines 0 comments Download
M tests/CodecTest.cpp View 11 chunks +147 lines, -229 lines 0 comments Download
M tests/ColorSpaceTest.cpp View 1 chunk +1 line, -4 lines 0 comments Download
M tests/ImageTest.cpp View 5 chunks +0 lines, -20 lines 0 comments Download

Messages

Total messages: 5 (2 generated)
scroggo
Created Revert of Make SkPngCodec decode progressively.
4 years, 6 months ago (2016-06-01 19:08:07 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/2026383002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/2026383002/1
4 years, 6 months ago (2016-06-01 19:08:17 UTC) #3
commit-bot: I haz the power
4 years, 6 months ago (2016-06-01 19:08:33 UTC) #5
Message was sent while issue was closed.
Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/26694c32d2a7a511bb2832204bb7759219b9d7bc

Powered by Google App Engine
This is Rietveld 408576698