From 6711aa21e263a270ecd2d6a6ee1b673e665ce98a Mon Sep 17 00:00:00 2001 From: Claudio Freire Date: Fri, 8 Jan 2016 05:31:32 -0300 Subject: 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. --- tests/fate/aac.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/fate/aac.mak') diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 873629d..81edc12 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 -- cgit v1.1