commit a1aa19c9935c3974174d71ea3a5fc03c70825df7
author Wan-Teh Chang <wtc@google.com> Fri May 28 14:29:25 2021 -0700
committer Joe Drago <joedrago@gmail.com> Tue Jun 01 08:35:00 2021 -0700
tree ee2fcee6c35939c452cc6af3fe3c976361986885
parent 326926109beb91b0d0d13e48ab09bbc8de0f4db3

Simplify avifCodecConfigurationBoxGetFormat

Simplify the conditionals in avifCodecConfigurationBoxGetFormat(). Once
monochrome has been eliminated, YUV 4:2:0 is the only one with
subsampling_y == 1. And the remaining two can be differentiated by
testing subsampling_x.

src/read.c

diff --git a/src/read.c b/src/read.c
index c0bf45a..0854ae5 100644
--- a/src/read.c
+++ b/src/read.c
@@ -290,9 +290,9 @@
 {
     if (av1C->monochrome) {
         return AVIF_PIXEL_FORMAT_YUV400;
-    } else if ((av1C->chromaSubsamplingX == 1) && (av1C->chromaSubsamplingY == 1)) {
+    } else if (av1C->chromaSubsamplingY == 1) {
         return AVIF_PIXEL_FORMAT_YUV420;
-    } else if ((av1C->chromaSubsamplingX == 1) && (av1C->chromaSubsamplingY == 0)) {
+    } else if (av1C->chromaSubsamplingX == 1) {
         return AVIF_PIXEL_FORMAT_YUV422;
     }
     return AVIF_PIXEL_FORMAT_YUV444;