diff options
| author |  msarett <msarett@google.com> | 2016-03-07 08:39:12 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-07 08:39:12 -0800 |
| commit | 095d31c8a0eeb5d491febf064bc3c8a44e22b94f (patch) | |
| tree | 415ad73df7c480fcb9329cec90ac2883c4c9b72f /tests/ImageGeneratorTest.cpp | |
| parent | a9101eef5ffc5f329a5edc75fd67441d868b0e9b (diff) | |
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
Review URL: https://codereview.chromium.org/1716523002
Diffstat (limited to 'tests/ImageGeneratorTest.cpp')
| -rw-r--r-- | tests/ImageGeneratorTest.cpp | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/tests/ImageGeneratorTest.cpp b/tests/ImageGeneratorTest.cpp index 7288ecf0a9..3d750b2c73 100644 --- a/tests/ImageGeneratorTest.cpp +++ b/tests/ImageGeneratorTest.cpp @@ -46,27 +46,25 @@ public: DEF_TEST(ImageGenerator, reporter) { MyImageGenerator ig; - 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 }; + 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 }; SkYUVColorSpace colorSpace; // Check that the YUV decoding API does not cause any crashes - 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); - + ig.queryYUV8(&sizeInfo, nullptr); + ig.queryYUV8(&sizeInfo, &colorSpace); + sizeInfo.fWidthBytes[SkYUVSizeInfo::kY] = 250; + sizeInfo.fWidthBytes[SkYUVSizeInfo::kU] = 250; + sizeInfo.fWidthBytes[SkYUVSizeInfo::kV] = 250; int dummy; - planes[0] = planes[1] = planes[2] = &dummy; - rowBytes[0] = rowBytes[1] = rowBytes[2] = 250; - - ig.getYUV8Planes(sizes, planes, rowBytes, &colorSpace); + planes[SkYUVSizeInfo::kY] = planes[SkYUVSizeInfo::kU] = planes[SkYUVSizeInfo::kV] = &dummy; + ig.getYUV8Planes(sizeInfo, planes); // Suppressed due to https://code.google.com/p/skia/issues/detail?id=4339 if (false) { |