From af548259ad89a294670adec83cf0b9be721a8b60 Mon Sep 17 00:00:00 2001 From: Monty Date: Tue, 26 Oct 2010 17:09:47 +0000 Subject: [PATCH] Back out the old HF AoTuV weighting which was first enabled in Everywhere. There are a few samples where I really don't like the effect it causes. svn path=/trunk/vorbis/; revision=17569 --- lib/psy.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/psy.c b/lib/psy.c index f1330a5..507b509 100644 --- a/lib/psy.c +++ b/lib/psy.c @@ -1160,14 +1160,22 @@ void _vp_couple_quantize_normalize(int blobno, However, this is a temporary patch. by Aoyumi @ 2004/04/18 */ - float derate = (1.0 - de*((float)(j-limit+i) / (float)(n-limit))); - - /* elliptical */ + /*float derate = (1.0 - de*((float)(j-limit+i) / (float)(n-limit))); + /* elliptical if(reM[j]+reA[j]<0){ reM[j] = - (qeM[j] = (fabs(reM[j])+fabs(reA[j]))*derate*derate); }else{ reM[j] = (qeM[j] = (fabs(reM[j])+fabs(reA[j]))*derate*derate); + }*/ + + /* elliptical */ + if(reM[j]+reA[j]<0){ + reM[j] = - (qeM[j] = fabs(reM[j])+fabs(reA[j])); + }else{ + reM[j] = (qeM[j] = fabs(reM[j])+fabs(reA[j])); } + + } reA[j]=qeA[j]=0.f; fA[j]=1; -- 2.7.4