diff options
| author | Claudio Freire <klaussfreire@gmail.com> | 2016-01-08 05:31:32 -0300 |
|---|---|---|
| committer | Claudio Freire <klaussfreire@gmail.com> | 2016-01-13 05:28:34 -0300 |
| commit | 6711aa21e263a270ecd2d6a6ee1b673e665ce98a (patch) | |
| tree | 0dabd389dc37350c7fe3c632fd73f558f984cc95 /tests | |
| parent | 4dcb69cc12d00d46f93a07178e2087a8d27c8f64 (diff) | |
AAC encoder: various fixes in M/S coding
1. Fix sf_idx and band_type addressing to address only the first
subwindow in the group (others could hold garbage values)
2. Don't step on ms_mask when is_mask is set. I/S selection
already sets the ms_mask properly and shouldn't be overridden.
3. Use mid/sid cb/sf when computing coding error, as should be
since those are the cb/sfs that will eventually be set.
4. Fix distortion computation on multi-subwindow groups (was
subtracting the bits terms multiple times)
5. Clear ms_mask when one side uses PNS and the other doesn't.
When using PNS, ms_mask signals correlated noise, which can be
detected just like regular M/S detection, so we don't skip
noise bands, but when only one side uses PNS setting the flag
can confuse some encoders, so avoid that.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/aac.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 873629d2f6..81edc12b57 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -146,7 +146,7 @@ fate-aac-aref-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aa fate-aac-aref-encode: CMP = stddev fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav fate-aac-aref-encode: CMP_SHIFT = -4096 -fate-aac-aref-encode: CMP_TARGET = 586 +fate-aac-aref-encode: CMP_TARGET = 669 fate-aac-aref-encode: SIZE_TOLERANCE = 2464 fate-aac-aref-encode: FUZZ = 89 |