Fix comments

AOMediaCodec · Feb 10, 2025 · 2ff8e4c · 2ff8e4c
1 parent 2b39fcb
commit 2ff8e4c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -59,7 +59,7 @@ The changes are relative to the previous release, unless the baseline is specifi
 * Reject non-essential transformative properties.
 * Treat avifenc --stdin as a regular positional file path argument.
 * Allow YCgCo_Re and YCgCo_Ro decoding by default. Encoding is still conditioned
-  to the AVIF_ENABLE_YCGCO_R_ENCODING CMake flag.
+  to the AVIF_ENABLE_YCGCO_R_ENCODING CMake option.
 
 ## [1.1.1] - 2024-07-30
 

diff --git a/apps/shared/avifjpeg.c b/apps/shared/avifjpeg.c
@@ -938,20 +938,19 @@ static avifBool avifJPEGReadInternal(FILE * f,
 
         avif->width = cinfo.output_width;
         avif->height = cinfo.output_height;
-        const avifBool useYCgCoR = (avif->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RE ||
-                                    avif->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RO);
+        if (avif->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RO) {
+            fprintf(stderr, "AVIF_MATRIX_COEFFICIENTS_YCGCO_RO cannot be used with JPEG because it has an even bit depth.\n");
+            goto cleanup;
+        }
         if (avif->yuvFormat == AVIF_PIXEL_FORMAT_NONE) {
             // Identity and YCgCo-R are only valid with YUV444.
-            avif->yuvFormat = (avif->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_IDENTITY || useYCgCoR)
+            avif->yuvFormat = (avif->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_IDENTITY ||
+                               avif->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RE)
                                   ? AVIF_PIXEL_FORMAT_YUV444
                                   : AVIF_APP_DEFAULT_PIXEL_FORMAT;
         }
         avif->depth = requestedDepth ? requestedDepth : 8;
-        if (useYCgCoR) {
-            if (avif->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RO) {
-                fprintf(stderr, "AVIF_MATRIX_COEFFICIENTS_YCGCO_RO cannot be used with JPEG because it has an even bit depth.\n");
-                goto cleanup;
-            }
+        if (avif->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RE) {
             if (requestedDepth && requestedDepth != 10) {
                 fprintf(stderr, "Cannot request %u bits for YCgCo-Re as it uses 2 extra bits.\n", requestedDepth);
                 goto cleanup;

diff --git a/src/write.c b/src/write.c
@@ -1636,7 +1636,7 @@ static avifResult avifValidateGrid(uint32_t gridCols,
                                   "YCGCO_R is not enabled for encoding. "
                                   "Please set AVIF_ENABLE_YCGCO_R_ENCODING in CMake. "
                                   "cf https://github.com/AOMediaCodec/libavif/issues/2077.");
-            return AVIF_RESULT_INVALID_IMAGE_GRID;
+            return AVIF_RESULT_NOT_IMPLEMENTED;
         }
 #endif
         const uint32_t expectedCellWidth = ((cellIndex + 1) % gridCols) ? tileWidth : bottomRightCell->width;

diff --git a/tests/gtest/aviflosslesstest.cc b/tests/gtest/aviflosslesstest.cc
@@ -59,7 +59,7 @@ TEST(BasicTest, EncodeDecodeMatrixCoefficients) {
 
 #if !defined(AVIF_ENABLE_YCGCO_R_ENCODING)
       if (matrix_coefficient == AVIF_MATRIX_COEFFICIENTS_YCGCO_RE) {
-        ASSERT_NE(result, AVIF_RESULT_OK);
+        EXPECT_EQ(result, AVIF_RESULT_NOT_IMPLEMENTED);
         continue;
       }
 #endif