This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 9cee5ae719 avcodec/aac: zero the output of a missing channel element
9cee5ae719 is described below
commit 9cee5ae719d6f82356d12782611b4a1d5866d251
Author: Romain Beauxis <[email protected]>
AuthorDate: Tue Sep 22 19:01:31 2026 -0500
Commit: Romain Beauxis <[email protected]>
CommitDate: Thu Sep 24 15:47:09 2026 +0000
avcodec/aac: zero the output of a missing channel element
---
libavcodec/aac/aacdec.c | 3 +
tests/fate/aac.mak | 9 +-
tests/ref/fate/aac-sce-in-stereo | 221 +++++++++++++++++++++++++++++++++++++++
3 files changed, 231 insertions(+), 2 deletions(-)
diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c
index 202c7aa30c..fdebe139c3 100644
--- a/libavcodec/aac/aacdec.c
+++ b/libavcodec/aac/aacdec.c
@@ -2181,6 +2181,9 @@ static void spectral_to_sample(AACDecContext *ac, int
samples)
che->present = 0;
} else if (che) {
av_log(ac->avctx, AV_LOG_VERBOSE, "ChannelElement %d.%d
missing \n", type, i);
+ memset(che->ch[0].output, 0, samples *
sizeof(*che->ch[0].output));
+ if (type == TYPE_CPE)
+ memset(che->ch[1].output, 0, samples *
sizeof(*che->ch[1].output));
}
}
}
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
index e89b4274a9..071fc8ae17 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -347,13 +347,18 @@ FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes)
$(FATE_AAC_FIXED-yes)
$(FATE_AAC_ALL): CMP = oneoff
$(FATE_AAC_ALL): FUZZ = 2
+FATE_AAC_FRAMECRC += fate-aac-sce-in-stereo
+fate-aac-sce-in-stereo: CMD = framecrc -i
$(TARGET_SAMPLES)/aac/aac-sce-in-stereo.mp4 -af "pan=mono|c0=c1,aresample" -c:a
pcm_f32le
+
+FATE_AAC_FRAMECRC-$(call FRAMECRC, MOV, AAC, ARESAMPLE_FILTER PAN_FILTER
PCM_F32LE_ENCODER) += $(FATE_AAC_FRAMECRC)
+
FATE_AAC_ENCODE-$(call TRANSCODE, AAC, MP4 MOV, WAV_MUXER WAV_DEMUXER
PCM_S16LE_DECODER ARESAMPLE_FILTER) += $(FATE_AAC_ENCODE)
FATE_AAC_ENCODE_FFPROBE-$(call TRANSCODE, AAC, ADTS AAC, WAV_DEMUXER
PCM_S16LE_DECODER ARESAMPLE_FILTER) += $(FATE_AAC_ENCODE_FFPROBE)
FATE_AAC_BSF-$(call FRAMECRC, AAC MATROSKA, AAC, AAC_PARSER AAC_ADTSTOASC_BSF
MATROSKA_MUXER) += fate-aac-autobsf-adtstoasc
-FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes)
$(FATE_AAC_BSF-yes)
+FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_FRAMECRC-yes)
$(FATE_AAC_ENCODE-yes) $(FATE_AAC_BSF-yes)
FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_AAC_ENCODE_FFPROBE-yes)
-fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes)
$(FATE_AAC_ENCODE_FFPROBE-yes) $(FATE_AAC_BSF-yes)
+fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_FRAMECRC-yes) $(FATE_AAC_ENCODE-yes)
$(FATE_AAC_ENCODE_FFPROBE-yes) $(FATE_AAC_BSF-yes)
fate-aac-latm: $(FATE_AAC_LATM-yes)
diff --git a/tests/ref/fate/aac-sce-in-stereo b/tests/ref/fate/aac-sce-in-stereo
new file mode 100644
index 0000000000..2dd04f9d7c
--- /dev/null
+++ b/tests/ref/fate/aac-sce-in-stereo
@@ -0,0 +1,221 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_f32le
+#sample_rate 0: 44100
+#channel_layout_name 0: mono
+0, 0, 0, 1024, 4096, 0x00000000
+0, 1024, 1024, 1024, 4096, 0x00000000
+0, 2048, 2048, 1024, 4096, 0x00000000
+0, 3072, 3072, 1024, 4096, 0x00000000
+0, 4096, 4096, 1024, 4096, 0x00000000
+0, 5120, 5120, 1024, 4096, 0x00000000
+0, 6144, 6144, 1024, 4096, 0x00000000
+0, 7168, 7168, 1024, 4096, 0x00000000
+0, 8192, 8192, 1024, 4096, 0x00000000
+0, 9216, 9216, 1024, 4096, 0x00000000
+0, 10240, 10240, 1024, 4096, 0x00000000
+0, 11264, 11264, 1024, 4096, 0x00000000
+0, 12288, 12288, 1024, 4096, 0x00000000
+0, 13312, 13312, 1024, 4096, 0x00000000
+0, 14336, 14336, 1024, 4096, 0x00000000
+0, 15360, 15360, 1024, 4096, 0x00000000
+0, 16384, 16384, 1024, 4096, 0x00000000
+0, 17408, 17408, 1024, 4096, 0x00000000
+0, 18432, 18432, 1024, 4096, 0x00000000
+0, 19456, 19456, 1024, 4096, 0x00000000
+0, 20480, 20480, 1024, 4096, 0x00000000
+0, 21504, 21504, 1024, 4096, 0x00000000
+0, 22528, 22528, 1024, 4096, 0x00000000
+0, 23552, 23552, 1024, 4096, 0x00000000
+0, 24576, 24576, 1024, 4096, 0x00000000
+0, 25600, 25600, 1024, 4096, 0x00000000
+0, 26624, 26624, 1024, 4096, 0x00000000
+0, 27648, 27648, 1024, 4096, 0x00000000
+0, 28672, 28672, 1024, 4096, 0x00000000
+0, 29696, 29696, 1024, 4096, 0x00000000
+0, 30720, 30720, 1024, 4096, 0x00000000
+0, 31744, 31744, 1024, 4096, 0x00000000
+0, 32768, 32768, 1024, 4096, 0x00000000
+0, 33792, 33792, 1024, 4096, 0x00000000
+0, 34816, 34816, 1024, 4096, 0x00000000
+0, 35840, 35840, 1024, 4096, 0x00000000
+0, 36864, 36864, 1024, 4096, 0x00000000
+0, 37888, 37888, 1024, 4096, 0x00000000
+0, 38912, 38912, 1024, 4096, 0x00000000
+0, 39936, 39936, 1024, 4096, 0x00000000
+0, 40960, 40960, 1024, 4096, 0x00000000
+0, 41984, 41984, 1024, 4096, 0x00000000
+0, 43008, 43008, 1024, 4096, 0x00000000
+0, 44032, 44032, 1024, 4096, 0x00000000
+0, 45056, 45056, 1024, 4096, 0x00000000
+0, 46080, 46080, 1024, 4096, 0x00000000
+0, 47104, 47104, 1024, 4096, 0x00000000
+0, 48128, 48128, 1024, 4096, 0x00000000
+0, 49152, 49152, 1024, 4096, 0x00000000
+0, 50176, 50176, 1024, 4096, 0x00000000
+0, 51200, 51200, 1024, 4096, 0x00000000
+0, 52224, 52224, 1024, 4096, 0x00000000
+0, 53248, 53248, 1024, 4096, 0x00000000
+0, 54272, 54272, 1024, 4096, 0x00000000
+0, 55296, 55296, 1024, 4096, 0x00000000
+0, 56320, 56320, 1024, 4096, 0x00000000
+0, 57344, 57344, 1024, 4096, 0x00000000
+0, 58368, 58368, 1024, 4096, 0x00000000
+0, 59392, 59392, 1024, 4096, 0x00000000
+0, 60416, 60416, 1024, 4096, 0x00000000
+0, 61440, 61440, 1024, 4096, 0x00000000
+0, 62464, 62464, 1024, 4096, 0x00000000
+0, 63488, 63488, 1024, 4096, 0x00000000
+0, 64512, 64512, 1024, 4096, 0x00000000
+0, 65536, 65536, 1024, 4096, 0x00000000
+0, 66560, 66560, 1024, 4096, 0x00000000
+0, 67584, 67584, 1024, 4096, 0x00000000
+0, 68608, 68608, 1024, 4096, 0x00000000
+0, 69632, 69632, 1024, 4096, 0x00000000
+0, 70656, 70656, 1024, 4096, 0x00000000
+0, 71680, 71680, 1024, 4096, 0x00000000
+0, 72704, 72704, 1024, 4096, 0x00000000
+0, 73728, 73728, 1024, 4096, 0x00000000
+0, 74752, 74752, 1024, 4096, 0x00000000
+0, 75776, 75776, 1024, 4096, 0x00000000
+0, 76800, 76800, 1024, 4096, 0x00000000
+0, 77824, 77824, 1024, 4096, 0x00000000
+0, 78848, 78848, 1024, 4096, 0x00000000
+0, 79872, 79872, 1024, 4096, 0x00000000
+0, 80896, 80896, 1024, 4096, 0x00000000
+0, 81920, 81920, 1024, 4096, 0x00000000
+0, 82944, 82944, 1024, 4096, 0x00000000
+0, 83968, 83968, 1024, 4096, 0x00000000
+0, 84992, 84992, 1024, 4096, 0x00000000
+0, 86016, 86016, 1024, 4096, 0x00000000
+0, 87040, 87040, 1024, 4096, 0x00000000
+0, 88064, 88064, 1024, 4096, 0x00000000
+0, 89088, 89088, 1024, 4096, 0x00000000
+0, 90112, 90112, 1024, 4096, 0x00000000
+0, 91136, 91136, 1024, 4096, 0x00000000
+0, 92160, 92160, 1024, 4096, 0x00000000
+0, 93184, 93184, 1024, 4096, 0x00000000
+0, 94208, 94208, 1024, 4096, 0x00000000
+0, 95232, 95232, 1024, 4096, 0x00000000
+0, 96256, 96256, 1024, 4096, 0x00000000
+0, 97280, 97280, 1024, 4096, 0x00000000
+0, 98304, 98304, 1024, 4096, 0x00000000
+0, 99328, 99328, 1024, 4096, 0x00000000
+0, 100352, 100352, 1024, 4096, 0x00000000
+0, 101376, 101376, 1024, 4096, 0x00000000
+0, 102400, 102400, 1024, 4096, 0x00000000
+0, 103424, 103424, 1024, 4096, 0x00000000
+0, 104448, 104448, 1024, 4096, 0x00000000
+0, 105472, 105472, 1024, 4096, 0x00000000
+0, 106496, 106496, 1024, 4096, 0x00000000
+0, 107520, 107520, 1024, 4096, 0x00000000
+0, 108544, 108544, 1024, 4096, 0x00000000
+0, 109568, 109568, 1024, 4096, 0x00000000
+0, 110592, 110592, 1024, 4096, 0x00000000
+0, 111616, 111616, 1024, 4096, 0x00000000
+0, 112640, 112640, 1024, 4096, 0x00000000
+0, 113664, 113664, 1024, 4096, 0x00000000
+0, 114688, 114688, 1024, 4096, 0x00000000
+0, 115712, 115712, 1024, 4096, 0x00000000
+0, 116736, 116736, 1024, 4096, 0x00000000
+0, 117760, 117760, 1024, 4096, 0x00000000
+0, 118784, 118784, 1024, 4096, 0x00000000
+0, 119808, 119808, 1024, 4096, 0x00000000
+0, 120832, 120832, 1024, 4096, 0x00000000
+0, 121856, 121856, 1024, 4096, 0x00000000
+0, 122880, 122880, 1024, 4096, 0x00000000
+0, 123904, 123904, 1024, 4096, 0x00000000
+0, 124928, 124928, 1024, 4096, 0x00000000
+0, 125952, 125952, 1024, 4096, 0x00000000
+0, 126976, 126976, 1024, 4096, 0x00000000
+0, 128000, 128000, 1024, 4096, 0x00000000
+0, 129024, 129024, 1024, 4096, 0x00000000
+0, 130048, 130048, 1024, 4096, 0x00000000
+0, 131072, 131072, 1024, 4096, 0x00000000
+0, 132096, 132096, 1024, 4096, 0x00000000
+0, 133120, 133120, 1024, 4096, 0x00000000
+0, 134144, 134144, 1024, 4096, 0x00000000
+0, 135168, 135168, 1024, 4096, 0x00000000
+0, 136192, 136192, 1024, 4096, 0x00000000
+0, 137216, 137216, 1024, 4096, 0x00000000
+0, 138240, 138240, 1024, 4096, 0x00000000
+0, 139264, 139264, 1024, 4096, 0x00000000
+0, 140288, 140288, 1024, 4096, 0x00000000
+0, 141312, 141312, 1024, 4096, 0x00000000
+0, 142336, 142336, 1024, 4096, 0x00000000
+0, 143360, 143360, 1024, 4096, 0x00000000
+0, 144384, 144384, 1024, 4096, 0x00000000
+0, 145408, 145408, 1024, 4096, 0x00000000
+0, 146432, 146432, 1024, 4096, 0x00000000
+0, 147456, 147456, 1024, 4096, 0x00000000
+0, 148480, 148480, 1024, 4096, 0x00000000
+0, 149504, 149504, 1024, 4096, 0x00000000
+0, 150528, 150528, 1024, 4096, 0x00000000
+0, 151552, 151552, 1024, 4096, 0x00000000
+0, 152576, 152576, 1024, 4096, 0x00000000
+0, 153600, 153600, 1024, 4096, 0x00000000
+0, 154624, 154624, 1024, 4096, 0x00000000
+0, 155648, 155648, 1024, 4096, 0x00000000
+0, 156672, 156672, 1024, 4096, 0x00000000
+0, 157696, 157696, 1024, 4096, 0x00000000
+0, 158720, 158720, 1024, 4096, 0x00000000
+0, 159744, 159744, 1024, 4096, 0x00000000
+0, 160768, 160768, 1024, 4096, 0x00000000
+0, 161792, 161792, 1024, 4096, 0x00000000
+0, 162816, 162816, 1024, 4096, 0x00000000
+0, 163840, 163840, 1024, 4096, 0x00000000
+0, 164864, 164864, 1024, 4096, 0x00000000
+0, 165888, 165888, 1024, 4096, 0x00000000
+0, 166912, 166912, 1024, 4096, 0x00000000
+0, 167936, 167936, 1024, 4096, 0x00000000
+0, 168960, 168960, 1024, 4096, 0x00000000
+0, 169984, 169984, 1024, 4096, 0x00000000
+0, 171008, 171008, 1024, 4096, 0x00000000
+0, 172032, 172032, 1024, 4096, 0x00000000
+0, 173056, 173056, 1024, 4096, 0x00000000
+0, 174080, 174080, 1024, 4096, 0x00000000
+0, 175104, 175104, 1024, 4096, 0x00000000
+0, 176128, 176128, 1024, 4096, 0x00000000
+0, 177152, 177152, 1024, 4096, 0x00000000
+0, 178176, 178176, 1024, 4096, 0x00000000
+0, 179200, 179200, 1024, 4096, 0x00000000
+0, 180224, 180224, 1024, 4096, 0x00000000
+0, 181248, 181248, 1024, 4096, 0x00000000
+0, 182272, 182272, 1024, 4096, 0x00000000
+0, 183296, 183296, 1024, 4096, 0x00000000
+0, 184320, 184320, 1024, 4096, 0x00000000
+0, 185344, 185344, 1024, 4096, 0x00000000
+0, 186368, 186368, 1024, 4096, 0x00000000
+0, 187392, 187392, 1024, 4096, 0x00000000
+0, 188416, 188416, 1024, 4096, 0x00000000
+0, 189440, 189440, 1024, 4096, 0x00000000
+0, 190464, 190464, 1024, 4096, 0x00000000
+0, 191488, 191488, 1024, 4096, 0x00000000
+0, 192512, 192512, 1024, 4096, 0x00000000
+0, 193536, 193536, 1024, 4096, 0x00000000
+0, 194560, 194560, 1024, 4096, 0x00000000
+0, 195584, 195584, 1024, 4096, 0x00000000
+0, 196608, 196608, 1024, 4096, 0x00000000
+0, 197632, 197632, 1024, 4096, 0x00000000
+0, 198656, 198656, 1024, 4096, 0x00000000
+0, 199680, 199680, 1024, 4096, 0x00000000
+0, 200704, 200704, 1024, 4096, 0x00000000
+0, 201728, 201728, 1024, 4096, 0x00000000
+0, 202752, 202752, 1024, 4096, 0x00000000
+0, 203776, 203776, 1024, 4096, 0x00000000
+0, 204800, 204800, 1024, 4096, 0x00000000
+0, 205824, 205824, 1024, 4096, 0x00000000
+0, 206848, 206848, 1024, 4096, 0x00000000
+0, 207872, 207872, 1024, 4096, 0x00000000
+0, 208896, 208896, 1024, 4096, 0x00000000
+0, 209920, 209920, 1024, 4096, 0x00000000
+0, 210944, 210944, 1024, 4096, 0x00000000
+0, 211968, 211968, 1024, 4096, 0x00000000
+0, 212992, 212992, 1024, 4096, 0x00000000
+0, 214016, 214016, 1024, 4096, 0x00000000
+0, 215040, 215040, 1024, 4096, 0x00000000
+0, 216064, 216064, 1024, 4096, 0x00000000
+0, 217088, 217088, 1024, 4096, 0x00000000
+0, 218112, 218112, 1024, 4096, 0x00000000
+0, 219136, 219136, 1024, 4096, 0x00000000
+0, 220160, 220160, 340, 1360, 0x00000000
--
To stop receiving notification emails like this one, please contact
[email protected].
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
