devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

revert last commit (r24660). There was a mistake in the location of the

Browse source 
shifts leading to a deteriorated sound quality for some samples.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24662 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Mohamed Tarek 2010-02-15 00:04:33 +00:00
parent b540be8f4b
commit 1bef4c6650
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/codecs/libatrac/atrac3.c
View file

@ -410,19 +410,13 @@ static int decodeSpectrum (GetBitContext *gb, int32_t *pOut)
SF = fixmul31(SFTable_fixed[SF_idxs[cnt]], iMaxQuant_fix[subband_vlc_index[cnt]]); SF = fixmul31(SFTable_fixed[SF_idxs[cnt]], iMaxQuant_fix[subband_vlc_index[cnt]]);
/* Inverse quantize the coefficients. */ /* Inverse quantize the coefficients. */
/* Remark: Hardcoded hack to add 2 bits (empty) fract part to internal sample
* representation. Needed for higher accuracy in internal calculations as
* well as for DSP configuration. See also: ../atrac3_rm.c, DSP_SET_SAMPLE_DEPTH
* Todo: Check spectral requantisation for using and outputting samples with
* fract part. */
if((first/256) &1) { if((first/256) &1) {
/* Odd band - Reverse coefficients */ /* Odd band - Reverse coefficients */
for (pIn=mantissas ; last>first; last--, pIn++) for (pIn=mantissas ; last>first; last--, pIn++)
pOut[last] = fixmul16(*pIn, SF) << 2; pOut[last] = fixmul16(*pIn, SF);
} else { } else {
for (pIn=mantissas ; first<last; first++, pIn++) for (pIn=mantissas ; first<last; first++, pIn++)
pOut[first] = fixmul16(*pIn, SF) << 2; pOut[first] = fixmul16(*pIn, SF);
} }
} else { } else {
@ -783,6 +777,16 @@ static int decodeChannelSoundUnit (GetBitContext *gb, channel_unit *pSnd, int32_
numBands = (subbandTab[numSubbands] - 1) >> 8; numBands = (subbandTab[numSubbands] - 1) >> 8;
if (lastTonal >= 0) if (lastTonal >= 0)
numBands = FFMAX((lastTonal + 256) >> 8, numBands); numBands = FFMAX((lastTonal + 256) >> 8, numBands);
/* Remark: Hardcoded hack to add 2 bits (empty) fract part to internal sample
* representation. Needed for higher accuracy in internal calculations as
* well as for DSP configuration. See also: ../atrac3_rm.c, DSP_SET_SAMPLE_DEPTH
* Todo: Check spectral requantisation for using and outputting samples with
* fract part. */
int32_t i;
for (i=0; i<1024; ++i) {
pSnd->spectrum[i] <<= 2;
}
/* Reconstruct time domain samples. */ /* Reconstruct time domain samples. */
for (band=0; band<4; band++) { for (band=0; band<4; band++) {