RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-19 22:01:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix decoding of 01-Untitled(1).oma, patch by Maxim Poliakovski

Browse Source 
Originally committed as revision 13238 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Maxim Poliakovski 2008-05-22 19:16:28 +00:00 committed by Benjamin Larsson
parent 6f04eb1e8a
commit 9d278d8859
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/atrac3.c
View File

@ -468,7 +468,7 @@ static int decodeTonalComponents (GetBitContext *gb, tonal_component *pComponent
pComponent[component_count].numCoefs = coded_values;
/* inverse quant */
pCoef = pComponent[k].coef;
pCoef = pComponent[component_count].coef;
for (cnt = 0; cnt < coded_values; cnt++)
pCoef[cnt] = mantissa[cnt] * scalefactor;
@ -577,24 +577,28 @@ static void gainCompensateAndOverlap (float *pIn, float *pPrev, float *pOut, gai
/**
* Combine the tonal band spectrum and regular band spectrum
* Return position of the last tonal coefficient
*
* @param pSpectrum output spectrum buffer
* @param numComponents amount of tonal components
* @param pComponent tonal components for this band
*/
static void addTonalComponents (float *pSpectrum, int numComponents, tonal_component *pComponent)
static int addTonalComponents (float *pSpectrum, int numComponents, tonal_component *pComponent)
{
int cnt, i;
int cnt, i, lastPos = -1;
float *pIn, *pOut;
for (cnt = 0; cnt < numComponents; cnt++){
lastPos = FFMAX(pComponent[cnt].pos + pComponent[cnt].numCoefs, lastPos);
pIn = pComponent[cnt].coef;
pOut = &(pSpectrum[pComponent[cnt].pos]);
for (i=0 ; i<pComponent[cnt].numCoefs ; i++)
pOut[i] += pIn[i];
}
return lastPos;
}
@ -714,7 +718,7 @@ static void channelWeighting (float *su1, float *su2, int *p3)
static int decodeChannelSoundUnit (ATRAC3Context *q, GetBitContext *gb, channel_unit *pSnd, float *pOut, int channelNum, int codingMode)
{
int band, result=0, numSubbands, numBands;
int band, result=0, numSubbands, lastTonal, numBands;
if (codingMode == JOINT_STEREO && channelNum == 1) {
if (get_bits(gb,2) != 3) {
@ -740,11 +744,13 @@ static int decodeChannelSoundUnit (ATRAC3Context *q, GetBitContext *gb, channel_
numSubbands = decodeSpectrum (gb, pSnd->spectrum);
/* Merge the decoded spectrum and tonal components. */
addTonalComponents (pSnd->spectrum, pSnd->numComponents, pSnd->components);
lastTonal = addTonalComponents (pSnd->spectrum, pSnd->numComponents, pSnd->components);
/* Convert number of subbands into number of MLT/QMF bands */
/* calculate number of used MLT/QMF bands according to the amount of coded spectral lines */
numBands = (subbandTab[numSubbands] - 1) >> 8;
if (lastTonal >= 0)
numBands = FFMAX((lastTonal + 256) >> 8, numBands);
/* Reconstruct time domain samples. */