commit 0c0b5a6bb2b23de0c9edbd24a0dbb89559b8fc9a
author Brian Salomon <bsalomon@google.com> Mon Jan 11 14:40:44 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 12 15:06:26 2021 +0000
tree f0e7233afd1099661ba32154d6c0a1a4bab4d428
parent 3a92f776b002a098a0528f6a0c7e3ec2ebadb694

Remove SkYUVASizeInfo, make SkYUVAIndex a private part of SkYUVAInfo

Bug: skia:10632
Change-Id: If4dd7779b0856f6d0b441381bf7f2f51527cdb9d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352497
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrYUVABackendTextures.cpp

diff --git a/src/gpu/GrYUVABackendTextures.cpp b/src/gpu/GrYUVABackendTextures.cpp
index a29e700..66743df 100644
--- a/src/gpu/GrYUVABackendTextures.cpp
+++ b/src/gpu/GrYUVABackendTextures.cpp
@@ -7,6 +7,8 @@
 
 #include "include/gpu/GrYUVABackendTextures.h"
 
+#include "src/core/SkYUVAInfoLocation.h"
+
 static int num_channels(const GrBackendFormat& format) {
     switch (format.channelMask()) {
         case kRed_SkColorChannelFlag        : return 1;
@@ -59,13 +61,16 @@
     return std::equal(fPlaneFormats, fPlaneFormats + n, that.fPlaneFormats);
 }
 
-bool GrYUVABackendTextureInfo::toYUVAIndices(SkYUVAIndex indices[SkYUVAIndex::kIndexCount]) const {
-    SkASSERT(indices);
+SkYUVAInfo::YUVALocations GrYUVABackendTextureInfo::toYUVALocations() const {
     uint32_t channelFlags[] = {fPlaneFormats[0].channelMask(),
                                fPlaneFormats[1].channelMask(),
                                fPlaneFormats[2].channelMask(),
                                fPlaneFormats[3].channelMask()};
-    return fYUVAInfo.toYUVAIndices(channelFlags, indices);
+    auto result = fYUVAInfo.toYUVALocations(channelFlags);
+    SkDEBUGCODE(int numPlanes;)
+    SkASSERT(SkYUVAInfo::YUVALocation::AreValidLocations(result, &numPlanes));
+    SkASSERT(numPlanes == this->numPlanes());
+    return result;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -93,11 +98,14 @@
     }
 }
 
-bool GrYUVABackendTextures::toYUVAIndices(SkYUVAIndex indices[SkYUVAIndex::kIndexCount]) const {
-    SkASSERT(indices);
+SkYUVAInfo::YUVALocations GrYUVABackendTextures::toYUVALocations() const {
     uint32_t channelFlags[] = {fTextures[0].getBackendFormat().channelMask(),
                                fTextures[1].getBackendFormat().channelMask(),
                                fTextures[2].getBackendFormat().channelMask(),
                                fTextures[3].getBackendFormat().channelMask()};
-    return fYUVAInfo.toYUVAIndices(channelFlags, indices);
+    auto result = fYUVAInfo.toYUVALocations(channelFlags);
+    SkDEBUGCODE(int numPlanes;)
+    SkASSERT(SkYUVAInfo::YUVALocation::AreValidLocations(result, &numPlanes));
+    SkASSERT(numPlanes == this->numPlanes());
+    return result;
 }