commit 6cab58c3925e0f4138e15a4ed510161ea83b6db1
author Wan-Teh Chang <wtc@google.com> Fri Apr 12 15:06:40 2024 -0700
committer Jerome Jiang <jianj@google.com> Mon Apr 22 14:47:56 2024 +0000
tree 1dc80898956665083ce407a6f210b5c94f0a96e5
parent edbeb7e7db969da09fe6f29f91cd61c6fbad9e58

Simplify conditions in aom_img_plane_width/height

Simplify the if conditions in aom_img_plane_width() and
aom_img_plane_height().

Change-Id: I81fa7484ca706be33142824365df4dcd65e3bc8b
(cherry picked from commit 6b4246129daaec35a19a5854369403a49bfd7840)

aom/src/aom_image.c

diff --git a/aom/src/aom_image.c b/aom/src/aom_image.c
index f8d4c78..1d3b7df 100644
--- a/aom/src/aom_image.c
+++ b/aom/src/aom_image.c
@@ -304,15 +304,15 @@
 }
 
 int aom_img_plane_width(const aom_image_t *img, int plane) {
-  if (plane > 0 && img->x_chroma_shift > 0)
-    return (img->d_w + 1) >> img->x_chroma_shift;
+  if (plane > 0)
+    return (img->d_w + img->x_chroma_shift) >> img->x_chroma_shift;
   else
     return img->d_w;
 }
 
 int aom_img_plane_height(const aom_image_t *img, int plane) {
-  if (plane > 0 && img->y_chroma_shift > 0)
-    return (img->d_h + 1) >> img->y_chroma_shift;
+  if (plane > 0)
+    return (img->d_h + img->y_chroma_shift) >> img->y_chroma_shift;
   else
     return img->d_h;
 }