From 1590f3b32890f6455b30494308633177b54db347 Mon Sep 17 00:00:00 2001 From: msarett Date: Mon, 7 Mar 2016 09:16:52 -0800 Subject: 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 --- tests/ImageGeneratorTest.cpp | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'tests/ImageGeneratorTest.cpp') diff --git a/tests/ImageGeneratorTest.cpp b/tests/ImageGeneratorTest.cpp index 3d750b2c73..7288ecf0a9 100644 --- a/tests/ImageGeneratorTest.cpp +++ b/tests/ImageGeneratorTest.cpp @@ -46,25 +46,27 @@ public: DEF_TEST(ImageGenerator, reporter) { MyImageGenerator ig; - SkYUVSizeInfo sizeInfo; - sizeInfo.fSizes[SkYUVSizeInfo::kY] = SkISize::Make(200, 200); - sizeInfo.fSizes[SkYUVSizeInfo::kU] = SkISize::Make(100, 100); - sizeInfo.fSizes[SkYUVSizeInfo::kV] = SkISize::Make( 50, 50); - sizeInfo.fWidthBytes[SkYUVSizeInfo::kY] = 0; - sizeInfo.fWidthBytes[SkYUVSizeInfo::kU] = 0; - sizeInfo.fWidthBytes[SkYUVSizeInfo::kV] = 0; - void* planes[3] = { nullptr }; + SkISize sizes[3]; + sizes[0] = SkISize::Make(200, 200); + sizes[1] = SkISize::Make(100, 100); + sizes[2] = SkISize::Make( 50, 50); + void* planes[3] = { nullptr }; + size_t rowBytes[3] = { 0 }; SkYUVColorSpace colorSpace; // Check that the YUV decoding API does not cause any crashes - ig.queryYUV8(&sizeInfo, nullptr); - ig.queryYUV8(&sizeInfo, &colorSpace); - sizeInfo.fWidthBytes[SkYUVSizeInfo::kY] = 250; - sizeInfo.fWidthBytes[SkYUVSizeInfo::kU] = 250; - sizeInfo.fWidthBytes[SkYUVSizeInfo::kV] = 250; + ig.getYUV8Planes(sizes, nullptr, nullptr, &colorSpace); + ig.getYUV8Planes(sizes, nullptr, nullptr, nullptr); + ig.getYUV8Planes(sizes, planes, nullptr, nullptr); + ig.getYUV8Planes(sizes, nullptr, rowBytes, nullptr); + ig.getYUV8Planes(sizes, planes, rowBytes, nullptr); + ig.getYUV8Planes(sizes, planes, rowBytes, &colorSpace); + int dummy; - planes[SkYUVSizeInfo::kY] = planes[SkYUVSizeInfo::kU] = planes[SkYUVSizeInfo::kV] = &dummy; - ig.getYUV8Planes(sizeInfo, planes); + planes[0] = planes[1] = planes[2] = &dummy; + rowBytes[0] = rowBytes[1] = rowBytes[2] = 250; + + ig.getYUV8Planes(sizes, planes, rowBytes, &colorSpace); // Suppressed due to https://code.google.com/p/skia/issues/detail?id=4339 if (false) { -- cgit v1.2.3