audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Bug 2163] Continuous error state importing AIFF / IMA ADPCM 

I can't believe I didn't test stereo.  Anyway, this fixes it.
This commit is contained in:
Leland Lucius 2020-03-17 12:58:34 -05:00
parent 5c038f92ef
commit 88dd25853e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib-src/libsndfile/src/ima_adpcm.c
View File

@ -322,11 +322,10 @@ count ++ ;
static int static int
aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
{ int chan, k, step, diff, vpdiff, blockindx, indx, nib ; { int chan, k, step, diff, vpdiff, blockindx, indx ;
short bytecode, mask ; short bytecode, mask ;
k = 0; k = 0;
nib = 0;
for (chan = 0 ; chan < pima->channels ; chan ++) for (chan = 0 ; chan < pima->channels ; chan ++)
{ blockindx = chan * pima->blocksize ; { blockindx = chan * pima->blocksize ;
/* Encode the block header. */ /* Encode the block header. */
@ -334,8 +333,8 @@ aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
pima->block [blockindx++] = (pima->previous [chan] & 0x80) + (pima->stepindx [chan] & 0x7F) ; pima->block [blockindx++] = (pima->previous [chan] & 0x80) + (pima->stepindx [chan] & 0x7F) ;
/* Encode the samples as 4 bit. */ /* Encode the samples as 4 bit. */
for (indx = 0 ; indx < pima->samplesperblock ; indx ++) for (indx = chan ; indx < pima->samplesperblock * pima->channels ; indx += pima->channels)
{ diff = pima->samples [k++] - pima->previous [chan] ; { diff = pima->samples [indx] - pima->previous [chan] ;
bytecode = 0 ; bytecode = 0 ;
step = ima_step_size [pima->stepindx [chan]] ; step = ima_step_size [pima->stepindx [chan]] ;
@ -367,9 +366,9 @@ aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
pima->stepindx [chan] += ima_indx_adjust [bytecode] ; pima->stepindx [chan] += ima_indx_adjust [bytecode] ;
pima->stepindx [chan] = clamp_ima_step_index (pima->stepindx [chan]) ; pima->stepindx [chan] = clamp_ima_step_index (pima->stepindx [chan]) ;
pima->block [blockindx] = (bytecode << (4 * nib)) | pima->block [blockindx]; pima->block [blockindx] = (bytecode << (4 * k)) | pima->block [blockindx];
blockindx += nib ; blockindx += k ;
nib = 1 - nib ; k = 1 - k ;
} ; } ;
} ; } ;
@ -813,7 +812,7 @@ ima_writer_init (SF_PRIVATE *psf, int blockalign)
break ; break ;
case SF_FORMAT_AIFF : case SF_FORMAT_AIFF :
samplesperblock = 2 * (blockalign - 2 * psf->sf.channels) / psf->sf.channels ; samplesperblock = 2 * ((blockalign - 2) * psf->sf.channels) / psf->sf.channels ;
break ; break ;
default : default :