commit 429b005c95d7dd45298d12a99e0781de1bbeb37f
author Wan-Teh Chang <wtc@google.com> Thu Dec 01 08:41:31 2022 -0800
committer GitHub <noreply@github.com> Thu Dec 01 08:41:31 2022 -0800
tree 258c77af0bd6a73396879277358f241b1c384446
parent d767ecc239336731e7e6270e7c87fb7dd513d689

Two fixes for avifEncoder repetitionCount

In the C API, set the default of avifEncoder repetitionCount to
AVIF_REPETITION_COUNT_INFINITE properly in avifEncoderCreate(). (The
default is already set correctly in the avifenc program.)

Detect changes to avifEncoder repetitionCount and return the
AVIF_RESULT_CANNOT_CHANGE_SETTING error if it changes between frames.

src/write.c

diff --git a/src/write.c b/src/write.c
index 5484e46..7c420db 100644
--- a/src/write.c
+++ b/src/write.c
@@ -392,6 +392,7 @@
     encoder->speed = AVIF_SPEED_DEFAULT;
     encoder->keyframeInterval = 0;
     encoder->timescale = 1;
+    encoder->repetitionCount = AVIF_REPETITION_COUNT_INFINITE;
     encoder->quality = AVIF_QUALITY_DEFAULT;
     encoder->qualityAlpha = AVIF_QUALITY_DEFAULT;
     encoder->minQuantizer = AVIF_QUANTIZER_BEST_QUALITY;
@@ -430,6 +431,7 @@
     lastEncoder->speed = encoder->speed;
     lastEncoder->keyframeInterval = encoder->keyframeInterval;
     lastEncoder->timescale = encoder->timescale;
+    lastEncoder->repetitionCount = encoder->repetitionCount;
     lastEncoder->minQuantizer = encoder->minQuantizer;
     lastEncoder->maxQuantizer = encoder->maxQuantizer;
     lastEncoder->minQuantizerAlpha = encoder->minQuantizerAlpha;
@@ -455,7 +457,7 @@
 
     if ((lastEncoder->codecChoice != encoder->codecChoice) || (lastEncoder->maxThreads != encoder->maxThreads) ||
         (lastEncoder->speed != encoder->speed) || (lastEncoder->keyframeInterval != encoder->keyframeInterval) ||
-        (lastEncoder->timescale != encoder->timescale)) {
+        (lastEncoder->timescale != encoder->timescale) || (lastEncoder->repetitionCount != encoder->repetitionCount)) {
         return AVIF_FALSE;
     }
 

tests/gtest/avifchangesettingtest.cc

diff --git a/tests/gtest/avifchangesettingtest.cc b/tests/gtest/avifchangesettingtest.cc
index 871a06c..e37e346 100644
--- a/tests/gtest/avifchangesettingtest.cc
+++ b/tests/gtest/avifchangesettingtest.cc
@@ -130,6 +130,7 @@
   encoder->codecChoice = AVIF_CODEC_CHOICE_AOM;
   encoder->speed = AVIF_SPEED_FASTEST;
   encoder->timescale = 1;
+  ASSERT_EQ(encoder->repetitionCount, AVIF_REPETITION_COUNT_INFINITE);
   encoder->minQuantizer = 63;
   encoder->maxQuantizer = 63;
 
@@ -141,6 +142,16 @@
   ASSERT_EQ(avifEncoderAddImage(encoder.get(), image.get(), 1,
                                 AVIF_ADD_IMAGE_FLAG_FORCE_KEYFRAME),
             AVIF_RESULT_CANNOT_CHANGE_SETTING);
+
+  encoder->timescale = 1;
+  ASSERT_EQ(avifEncoderAddImage(encoder.get(), image.get(), 1,
+                                AVIF_ADD_IMAGE_FLAG_FORCE_KEYFRAME),
+            AVIF_RESULT_OK);
+
+  encoder->repetitionCount = 0;
+  ASSERT_EQ(avifEncoderAddImage(encoder.get(), image.get(), 1,
+                                AVIF_ADD_IMAGE_FLAG_FORCE_KEYFRAME),
+            AVIF_RESULT_CANNOT_CHANGE_SETTING);
 }
 
 }  // namespace