commit 7b2cf80b0c00706ddac2d116a088bcd19c16b2f4
author Joe Drago <jdrago@netflix.com> Tue Jun 09 17:57:23 2020 -0700
committer Joe Drago <jdrago@netflix.com> Tue Jun 09 17:57:23 2020 -0700
tree 11a981316c12a8beff8c1011535c25e4f7d8c493
parent fd7e8e99e64ce50157d2c98670a36d40a6718ec0

Replace containerChromaSubsamplingX, containerChromaSubsamplingY, and containerMonochrome with containerYUVFormat

src/avif.c

diff --git a/src/avif.c b/src/avif.c
index 6d98729..e7fe4c9 100644
--- a/src/avif.c
+++ b/src/avif.c
@@ -59,6 +59,7 @@
         case AVIF_PIXEL_FORMAT_YUV400:
             info->chromaShiftX = 1; // ignored, but some codecs might use 420 for mono
             info->chromaShiftY = 1; // ignored, but some codecs might use 420 for mono
+            info->monochrome = AVIF_TRUE;
             break;
 
         case AVIF_PIXEL_FORMAT_YV12:

src/read.c

diff --git a/src/read.c b/src/read.c
index 4308db4..98eae1b 100644
--- a/src/read.c
+++ b/src/read.c
@@ -2319,19 +2319,25 @@
 
     if (configBox) {
         decoder->containerDepth = avifCodecConfigurationBoxGetDepth(configBox);
-        decoder->containerChromaSubsamplingX = configBox->chromaSubsamplingX;
-        decoder->containerChromaSubsamplingY = configBox->chromaSubsamplingY;
-        decoder->containerMonochrome = (configBox->monochrome != 0);
+        if (configBox->monochrome) {
+            decoder->containerYUVFormat = AVIF_PIXEL_FORMAT_YUV400;
+        } else {
+            if (configBox->chromaSubsamplingX && configBox->chromaSubsamplingY) {
+                decoder->containerYUVFormat = AVIF_PIXEL_FORMAT_YUV420;
+            } else if (configBox->chromaSubsamplingX) {
+                decoder->containerYUVFormat = AVIF_PIXEL_FORMAT_YUV422;
+
+            } else {
+                decoder->containerYUVFormat = AVIF_PIXEL_FORMAT_YUV444;
+            }
+        }
         decoder->containerChromaSamplePosition = (avifChromaSamplePosition)configBox->chromaSamplePosition;
     } else {
         // I believe this path is very, very unlikely. An av1C box should be mandatory
         // in all valid AVIF configurations.
         decoder->containerDepth = 0;
-        decoder->containerChromaSubsamplingX = 0; // TODO: use sentinel value here?
-        decoder->containerChromaSubsamplingY = 0; // TODO: use sentinel value here?
+        decoder->containerYUVFormat = AVIF_PIXEL_FORMAT_YUV444;
         decoder->containerChromaSamplePosition = AVIF_CHROMA_SAMPLE_POSITION_UNKNOWN;
-
-        decoder->containerMonochrome = AVIF_FALSE;
     }
 
     return avifDecoderFlush(decoder);