diff options
| author | Claudio Freire <klaussfreire@gmail.com> | 2016-01-08 04:39:02 -0300 |
|---|---|---|
| committer | Claudio Freire <klaussfreire@gmail.com> | 2016-01-13 05:28:34 -0300 |
| commit | 00d481b2c37552634490443b3af6dc04e6b42239 (patch) | |
| tree | e0868fa6434bae58c62fc48dbe3d20ec49a81310 | |
| parent | 2a31b076b444d0c096efd4ab0eb4e19cf0ffd2ac (diff) | |
AAC encoder: avoid assertion failure on PNS
In rare corner cases it could still fail an assert on sf_diff due
to failure to update prev_sf in some code paths. Fix that case.
| -rw-r--r-- | libavcodec/aaccoder.c | 5 | ||||
| -rw-r--r-- | tests/fate/aac.mak | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index 6fcc6a0eab..2c125fd080 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -643,8 +643,11 @@ static void search_for_pns(AACEncContext *s, AVCodecContext *avctx, SingleChanne const int start = wstart+sce->ics.swb_offset[g]; const float freq = (start-wstart)*freq_mult; const float freq_boost = FFMAX(0.88f*freq/NOISE_LOW_LIMIT, 1.0f); - if (freq < NOISE_LOW_LIMIT || (start-wstart) >= cutoff) + if (freq < NOISE_LOW_LIMIT || (start-wstart) >= cutoff) { + if (!sce->zeroes[w*16+g]) + prev_sf = sce->sf_idx[w*16+g]; continue; + } for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { band = &s->psy.ch[s->cur_channel].psy_bands[(w+w2)*16+g]; sfb_energy += band->energy; diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index ae7ebfa66f..873629d2f6 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -173,7 +173,7 @@ fate-aac-pns-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-re fate-aac-pns-encode: CMP = stddev fate-aac-pns-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav fate-aac-pns-encode: CMP_SHIFT = -4096 -fate-aac-pns-encode: CMP_TARGET = 616 +fate-aac-pns-encode: CMP_TARGET = 662 fate-aac-pns-encode: SIZE_TOLERANCE = 3560 fate-aac-pns-encode: FUZZ = 72 |