discord · skidder · Jan 22, 2025 · Jan 22, 2025
diff --git a/avif.cpp b/avif.cpp
@@ -167,11 +167,13 @@ uint32_t avif_decoder_get_duration(const avif_decoder d) {
 }
 
 uint32_t avif_decoder_get_loop_count(const avif_decoder d) {
+    if (!d || !d->decoder) {
+        return 0;
+    }
     switch (d->decoder->repetitionCount) {
         case AVIF_REPETITION_COUNT_INFINITE:
-            return 0;
         case AVIF_REPETITION_COUNT_UNKNOWN:
-            return 1;
+            return 0;
         default:
             return d->decoder->repetitionCount;
     }

diff --git a/avif_test.go b/avif_test.go
@@ -19,6 +19,7 @@ func TestAvifOperations(t *testing.T) {
 		t.Run("NewAvifEncoder", testNewAvifEncoder)
 		t.Run("AvifDecoder_DecodeTo", testAvifDecoderDecodeTo)
 		t.Run("AvifEncoder_Encode", testAvifEncoderEncode)
+		t.Run("AvifDecoder_UnknownLoopCount", testAvifDecoderUnknownLoopCount)
 	})
 
 	t.Run("Conversion Operations", func(t *testing.T) {
@@ -115,6 +116,29 @@ func testAvifDecoderDuration(t *testing.T) {
 	}
 }
 
+func testAvifDecoderUnknownLoopCount(t *testing.T) {
+	testAvifImage, err := os.ReadFile("testdata/spinning-globe-unknown-loop-count.avif")
+	if err != nil {
+		t.Fatalf("Unexpected error while reading AVIF image: %v", err)
+	}
+	decoder, err := newAvifDecoder(testAvifImage)
+	if err != nil {
+		t.Fatalf("Unexpected error while decoding AVIF image data: %v", err)
+	}
+	defer decoder.Close()
+
+	// Verify the image is animated
+	if !decoder.IsAnimated() {
+		t.Error("Expected image to be animated")
+	}
+
+	// Check that unknown loop count is treated as infinite (0)
+	loopCount := decoder.LoopCount()
+	if loopCount != 0 {
+		t.Errorf("Expected loop count to be 0 (infinite) for unknown loop count, got %d", loopCount)
+	}
+}
+
 // Basic Encoder Tests
 // ----------------------------------------
 

diff --git a/testdata/spinning-globe-unknown-loop-count.avif b/testdata/spinning-globe-unknown-loop-count.avif