diff options
-rw-r--r-- | src/codec/SkJpegCodec.cpp | 10 | ||||
-rw-r--r-- | tests/CodecTest.cpp | 29 |
2 files changed, 34 insertions, 5 deletions
diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp index 0413f79a3c..eb059545bf 100644 --- a/src/codec/SkJpegCodec.cpp +++ b/src/codec/SkJpegCodec.cpp @@ -339,6 +339,11 @@ bool SkJpegCodec::onRewind() { } SkASSERT(nullptr != decoderMgr); fDecoderMgr.reset(decoderMgr); + + fSwizzler.reset(nullptr); + fSrcRow = nullptr; + fStorage.reset(); + return true; } @@ -588,11 +593,6 @@ SkCodec::Result SkJpegCodec::onStartScanlineDecode(const SkImageInfo& dstInfo, return kInvalidConversion; } - // Remove objects used for sampling. - fSwizzler.reset(nullptr); - fSrcRow = nullptr; - fStorage.reset(); - // Now, given valid output dimensions, we can start the decompress if (!jpeg_start_decompress(fDecoderMgr->dinfo())) { SkCodecPrintf("start decompress failed\n"); diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 12d6ac8d3d..b8b957fe55 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -1012,3 +1012,32 @@ DEF_TEST(Codec_wbmp_max_size, r) { REPORTER_ASSERT(r, !codec); } + +DEF_TEST(Codec_jpeg_rewind, r) { + const char* path = "mandrill_512_q075.jpg"; + SkAutoTDelete<SkStream> stream(resource(path)); + if (!stream) { + SkDebugf("Missing resource '%s'\n", path); + return; + } + SkAutoTDelete<SkAndroidCodec> codec(SkAndroidCodec::NewFromStream(stream.release())); + if (!codec) { + ERRORF(r, "Unable to create codec '%s'.", path); + return; + } + + const int width = codec->getInfo().width(); + const int height = codec->getInfo().height(); + size_t rowBytes = sizeof(SkPMColor) * width; + SkAutoMalloc pixelStorage(height * rowBytes); + + // Perform a sampled decode. + SkAndroidCodec::AndroidOptions opts; + opts.fSampleSize = 12; + codec->getAndroidPixels(codec->getInfo().makeWH(width / 12, height / 12), pixelStorage.get(), + rowBytes, &opts); + + // Rewind the codec and perform a full image decode. + SkCodec::Result result = codec->getPixels(codec->getInfo(), pixelStorage.get(), rowBytes); + REPORTER_ASSERT(r, SkCodec::kSuccess == result); +} |