diff options
| author |  msarett <msarett@google.com> | 2016-03-07 09:16:52 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-07 09:16:52 -0800 |
| commit | 1590f3b32890f6455b30494308633177b54db347 (patch) | |
| tree | 5fabc87ced4a0c49bc304d87306068647e8123c2 /tests/YUVTest.cpp | |
| parent | 54887a6a2e12b0f2c93e039b00678732b6518826 (diff) | |
Revert of Update Skia's YUV API (patchset #5 id:160001 of https://codereview.chromium.org/1716523002/ )
Reason for revert:
Blimp failures with manual roll in Chrome.
Original issue's description:
> Update Skia's YUV API
>
> We should match the recently designed API in SkCodec.
> https://codereview.chromium.org/1549473003/
>
> This requires changes in Chromium as well.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1716523002
>
> Committed: https://skia.googlesource.com/skia/+/095d31c8a0eeb5d491febf064bc3c8a44e22b94f
TBR=scroggo@google.com,reed@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1775493002
Diffstat (limited to 'tests/YUVTest.cpp')
| -rw-r--r-- | tests/YUVTest.cpp | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/tests/YUVTest.cpp b/tests/YUVTest.cpp index e1d8961205..b8c4e3598e 100644 --- a/tests/YUVTest.cpp +++ b/tests/YUVTest.cpp @@ -9,7 +9,6 @@ #include "Resources.h" #include "SkStream.h" #include "SkTemplates.h" -#include "SkYUVSizeInfo.h" #include "Test.h" static SkStreamAsset* resource(const char path[]) { @@ -32,7 +31,7 @@ static void codec_yuv(skiatest::Reporter* reporter, } // Test queryYUV8() - SkYUVSizeInfo info; + SkCodec::YUVSizeInfo info; bool success = codec->queryYUV8(nullptr, nullptr); REPORTER_ASSERT(reporter, !success); success = codec->queryYUV8(&info, nullptr); @@ -42,36 +41,27 @@ static void codec_yuv(skiatest::Reporter* reporter, } REPORTER_ASSERT(reporter, 0 == memcmp((const void*) &info, (const void*) expectedSizes, 3 * sizeof(SkISize))); - REPORTER_ASSERT(reporter, info.fWidthBytes[SkYUVSizeInfo::kY] == - (uint32_t) SkAlign8(info.fSizes[SkYUVSizeInfo::kY].width())); - REPORTER_ASSERT(reporter, info.fWidthBytes[SkYUVSizeInfo::kU] == - (uint32_t) SkAlign8(info.fSizes[SkYUVSizeInfo::kU].width())); - REPORTER_ASSERT(reporter, info.fWidthBytes[SkYUVSizeInfo::kV] == - (uint32_t) SkAlign8(info.fSizes[SkYUVSizeInfo::kV].width())); + REPORTER_ASSERT(reporter, info.fYWidthBytes == (uint32_t) SkAlign8(info.fYSize.width())); + REPORTER_ASSERT(reporter, info.fUWidthBytes == (uint32_t) SkAlign8(info.fUSize.width())); + REPORTER_ASSERT(reporter, info.fVWidthBytes == (uint32_t) SkAlign8(info.fVSize.width())); SkYUVColorSpace colorSpace; success = codec->queryYUV8(&info, &colorSpace); REPORTER_ASSERT(reporter, 0 == memcmp((const void*) &info, (const void*) expectedSizes, 3 * sizeof(SkISize))); - REPORTER_ASSERT(reporter, info.fWidthBytes[SkYUVSizeInfo::kY] == - (uint32_t) SkAlign8(info.fSizes[SkYUVSizeInfo::kY].width())); - REPORTER_ASSERT(reporter, info.fWidthBytes[SkYUVSizeInfo::kU] == - (uint32_t) SkAlign8(info.fSizes[SkYUVSizeInfo::kU].width())); - REPORTER_ASSERT(reporter, info.fWidthBytes[SkYUVSizeInfo::kV] == - (uint32_t) SkAlign8(info.fSizes[SkYUVSizeInfo::kV].width())); + REPORTER_ASSERT(reporter, info.fYWidthBytes == (uint32_t) SkAlign8(info.fYSize.width())); + REPORTER_ASSERT(reporter, info.fUWidthBytes == (uint32_t) SkAlign8(info.fUSize.width())); + REPORTER_ASSERT(reporter, info.fVWidthBytes == (uint32_t) SkAlign8(info.fVSize.width())); REPORTER_ASSERT(reporter, kJPEG_SkYUVColorSpace == colorSpace); // Allocate the memory for the YUV decode - size_t totalBytes = - info.fWidthBytes[SkYUVSizeInfo::kY] * info.fSizes[SkYUVSizeInfo::kY].height() + - info.fWidthBytes[SkYUVSizeInfo::kU] * info.fSizes[SkYUVSizeInfo::kU].height() + - info.fWidthBytes[SkYUVSizeInfo::kV] * info.fSizes[SkYUVSizeInfo::kV].height(); + size_t totalBytes = info.fYWidthBytes * info.fYSize.height() + + info.fUWidthBytes * info.fUSize.height() + + info.fVWidthBytes * info.fVSize.height(); SkAutoMalloc storage(totalBytes); void* planes[3]; planes[0] = storage.get(); - planes[1] = SkTAddOffset<void>(planes[0], - info.fWidthBytes[SkYUVSizeInfo::kY] * info.fSizes[SkYUVSizeInfo::kY].height()); - planes[2] = SkTAddOffset<void>(planes[1], - info.fWidthBytes[SkYUVSizeInfo::kU] * info.fSizes[SkYUVSizeInfo::kU].height()); + planes[1] = SkTAddOffset<void>(planes[0], info.fYWidthBytes * info.fYSize.height()); + planes[2] = SkTAddOffset<void>(planes[1], info.fUWidthBytes * info.fUSize.height()); // Test getYUV8Planes() REPORTER_ASSERT(reporter, SkCodec::kInvalidInput == |