diff options
author | Matt Sarett <msarett@google.com> | 2017-05-02 11:32:42 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-02 16:07:15 +0000 |
commit | 9b848d5749c5e34b56f927a3a3374c8ebafbd9db (patch) | |
tree | a7498e9c1c35c467e95a8c50ed70d8bbcaacd976 /tests | |
parent | a18d2db2fc2f708c4a71315ff21d822976bcabbf (diff) |
Add support for row-by-row jpeg encoding
Bug: 713862
Change-Id: I787b7c49662a00b89ae0ef35845dfbd6be3e6fb1
Reviewed-on: https://skia-review.googlesource.com/14641
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CodecTest.cpp | 3 | ||||
-rw-r--r-- | tests/EncodeTest.cpp | 56 | ||||
-rw-r--r-- | tests/ReadPixelsTest.cpp | 2 |
3 files changed, 59 insertions, 2 deletions
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 4a135337a7..45362db72c 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -20,6 +20,7 @@ #include "SkImageEncoderPriv.h" #include "SkMD5.h" #include "SkOSPath.h" +#include "SkJpegEncoder.h" #include "SkPngChunkReader.h" #include "SkRandom.h" #include "SkStream.h" @@ -1530,7 +1531,7 @@ static void encode_format(SkDynamicMemoryWStream* stream, const SkPixmap& pixmap SkEncodeImageAsPNG(stream, pixmap, opts); break; case SkEncodedImageFormat::kJPEG: - SkEncodeImageAsJPEG(stream, pixmap, opts); + SkJpegEncoder::Encode(stream, pixmap, SkJpegEncoder::Options()); break; case SkEncodedImageFormat::kWEBP: SkEncodeImageAsWEBP(stream, pixmap, opts); diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp new file mode 100644 index 0000000000..9db5039d59 --- /dev/null +++ b/tests/EncodeTest.cpp @@ -0,0 +1,56 @@ +/* + * Copyright 2017 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "Resources.h" +#include "Test.h" + +#include "SkBitmap.h" +#include "SkJpegEncoder.h" +#include "SkStream.h" + +DEF_TEST(Encode_Jpeg, r) { + SkBitmap bitmap; + bool success = GetResourceAsBitmap("mandrill_128.png", &bitmap); + if (!success) { + return; + } + + SkPixmap src; + success = bitmap.peekPixels(&src); + REPORTER_ASSERT(r, success); + if (!success) { + return; + } + + SkDynamicMemoryWStream dst0, dst1, dst2, dst3; + success = SkJpegEncoder::Encode(&dst0, src, SkJpegEncoder::Options()); + REPORTER_ASSERT(r, success); + + auto encoder1 = SkJpegEncoder::Make(&dst1, src, SkJpegEncoder::Options()); + for (int i = 0; i < src.height(); i++) { + success = encoder1->encodeRows(1); + REPORTER_ASSERT(r, success); + } + + auto encoder2 = SkJpegEncoder::Make(&dst2, src, SkJpegEncoder::Options()); + for (int i = 0; i < src.height(); i+=3) { + success = encoder2->encodeRows(3); + REPORTER_ASSERT(r, success); + } + + auto encoder3 = SkJpegEncoder::Make(&dst3, src, SkJpegEncoder::Options()); + success = encoder3->encodeRows(200); + REPORTER_ASSERT(r, success); + + sk_sp<SkData> data0 = dst0.detachAsData(); + sk_sp<SkData> data1 = dst1.detachAsData(); + sk_sp<SkData> data2 = dst2.detachAsData(); + sk_sp<SkData> data3 = dst3.detachAsData(); + REPORTER_ASSERT(r, data0->equals(data1.get())); + REPORTER_ASSERT(r, data0->equals(data2.get())); + REPORTER_ASSERT(r, data0->equals(data3.get())); +} diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index 9cb9200f5a..9363e71a00 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -530,7 +530,7 @@ static const void* five_reference_pixels(SkColorType colorType) { static void test_conversion(skiatest::Reporter* r, const SkImageInfo& dstInfo, const SkImageInfo& srcInfo) { - if (!SkImageInfoIsValid(srcInfo)) { + if (!SkImageInfoIsValidRenderingCS(srcInfo)) { return; } |