From fecee314dad6d6c3521908fab95ba0aa3c1b6c48 Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <wtc@google.com>
Date: Wed, 25 Feb 2026 17:45:43 -0800
Subject: [PATCH 1/2] Use libaom AOMD_SET_FRAME_SIZE_LIMIT if available

Bug: https://aomedia.g-issues.chromium.org/issues/485932002
---
 src/codec_aom.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/codec_aom.c b/src/codec_aom.c
index 97431fb418..366d922138 100644
--- a/src/codec_aom.c
+++ b/src/codec_aom.c
@@ -101,6 +101,7 @@ static avifBool aomCodecGetNextImage(struct avifCodec * codec,
     assert(sample);
 
     aom_codec_iface_t * const decoderInterface = aom_codec_av1_dx();
+#if !defined(AOM_CTRL_AOMD_SET_FRAME_SIZE_LIMIT)
     struct aom_codec_stream_info streamInfo = { 0 };
     aom_codec_err_t err = aom_codec_peek_stream_info(decoderInterface, sample->data.data, sample->data.size, &streamInfo);
     if (err != AOM_CODEC_OK) {
@@ -119,6 +120,7 @@ static avifBool aomCodecGetNextImage(struct avifCodec * codec,
             return AVIF_FALSE;
         }
     }
+#endif // !defined(AOM_CTRL_AOMD_SET_FRAME_SIZE_LIMIT)
 
     if (!codec->internal->decoderInitialized) {
         aom_codec_dec_cfg_t cfg;
@@ -131,6 +133,11 @@ static avifBool aomCodecGetNextImage(struct avifCodec * codec,
         }
         codec->internal->decoderInitialized = AVIF_TRUE;
 
+#if defined(AOM_CTRL_AOMD_SET_FRAME_SIZE_LIMIT)
+        if (codec->imageSizeLimit != 0 && aom_codec_control(&codec->internal->decoder, AOMD_SET_FRAME_SIZE_LIMIT, codec->imageSizeLimit)) {
+            return AVIF_FALSE;
+        }
+#endif // defined(AOM_CTRL_AOMD_SET_FRAME_SIZE_LIMIT)
         if (aom_codec_control(&codec->internal->decoder, AV1D_SET_OUTPUT_ALL_LAYERS, codec->allLayers)) {
             return AVIF_FALSE;
         }

From 7b8eed8f381fa1bbe8c0d3ae5af87fe0a9798819 Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <wtc@google.com>
Date: Thu, 26 Feb 2026 12:04:42 -0800
Subject: [PATCH 2/2] Document AOMD_SET_FRAME_SIZE_LIMIT is preferred

---
 src/codec_aom.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/codec_aom.c b/src/codec_aom.c
index 366d922138..058d7d7a6a 100644
--- a/src/codec_aom.c
+++ b/src/codec_aom.c
@@ -102,6 +102,10 @@ static avifBool aomCodecGetNextImage(struct avifCodec * codec,
 
     aom_codec_iface_t * const decoderInterface = aom_codec_av1_dx();
 #if !defined(AOM_CTRL_AOMD_SET_FRAME_SIZE_LIMIT)
+    // The AOMD_SET_FRAME_SIZE_LIMIT codec control (added in libaom v3.14.0),
+    // is the best way to impose a maximum on AV1 frame size. When
+    // AOMD_SET_FRAME_SIZE_LIMIT is not available, approximate it with
+    // aom_codec_peek_stream_info() and avifDimensionsTooLarge().
     struct aom_codec_stream_info streamInfo = { 0 };
     aom_codec_err_t err = aom_codec_peek_stream_info(decoderInterface, sample->data.data, sample->data.size, &streamInfo);
     if (err != AOM_CODEC_OK) {