diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-19 18:58:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 18:58:22 +0200 |
| commit | 7bdccc19119cec273f46d4d3b1be72f87049749a (patch) | |
| tree | 396b6824fb638cb7f97f074d2975e9b3c899b08d /drivers/vorbis/psy.c | |
| parent | 5cb31f6d5b667a551092b699de6f4786e0bb5b6d (diff) | |
| parent | 214f316cf9c861a0083cf74b790760aab77cb2ea (diff) | |
Merge pull request #5292 from J08nY/external-lib-update
External lib update: libogg, libvorbis, libtheora
Diffstat (limited to 'drivers/vorbis/psy.c')
| -rw-r--r-- | drivers/vorbis/psy.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/vorbis/psy.c b/drivers/vorbis/psy.c index 29d2824372..f7a44c6d00 100644 --- a/drivers/vorbis/psy.c +++ b/drivers/vorbis/psy.c @@ -11,7 +11,7 @@ ******************************************************************** function: psychoacoustics not including preecho - last mod: $Id: psy.c 17569 2010-10-26 17:09:47Z xiphmont $ + last mod: $Id: psy.c 18077 2011-09-02 02:49:00Z giles $ ********************************************************************/ @@ -1020,7 +1020,9 @@ void _vp_couple_quantize_normalize(int blobno, int limit = g->coupling_pointlimit[p->vi->blockflag][blobno]; float prepoint=stereo_threshholds[g->coupling_prepointamp[blobno]]; float postpoint=stereo_threshholds[g->coupling_postpointamp[blobno]]; +#if 0 float de=0.1*p->m_val; /* a blend of the AoTuV M2 and M3 code here and below */ +#endif /* mdct is our raw mdct output, floor not removed. */ /* inout passes in the ifloor, passes back quantized result */ @@ -1154,27 +1156,28 @@ void _vp_couple_quantize_normalize(int blobno, reM[j] += reA[j]; qeM[j] = fabs(reM[j]); }else{ +#if 0 /* AoTuV */ /** @ M2 ** The boost problem by the combination of noise normalization and point stereo is eased. 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); - }*/ - + } +#else /* 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])); } - +#endif } reA[j]=qeA[j]=0.f; |