RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nellymoserdec: Simplify calculation of numbers of blocks 

Originally committed as revision 23604 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-06-14 14:06:38 +00:00
parent f1a12c76cf
commit c5d68fbd49
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/nellymoserdec.c
View File

@ -166,25 +166,18 @@ static int decode_tag(AVCodecContext * avctx,
if (buf_size < avctx->block_align) if (buf_size < avctx->block_align)
return buf_size; return buf_size;
switch (buf_size) {
case 64: // 8000Hz
blocks = 1; break;
case 128: // 11025Hz
blocks = 2; break;
case 192: // 16000Hz
blocks = 3; break;
case 256: // 22050Hz
blocks = 4; break;
case 512: // 44100Hz
blocks = 8; break;
default:
if (buf_size % 64) { if (buf_size % 64) {
av_log(avctx, AV_LOG_DEBUG, "Tag size %d.\n", buf_size); av_log(avctx, AV_LOG_DEBUG, "Tag size %d.\n", buf_size);
return buf_size; return buf_size;
} }
blocks = buf_size / 64; blocks = buf_size / 64;
break; /* Normal numbers of blocks for sample rates:
} * 8000 Hz - 1
* 11025 Hz - 2
* 16000 Hz - 3
* 22050 Hz - 4
* 44100 Hz - 8
*/
for (i=0 ; i<blocks ; i++) { for (i=0 ; i<blocks ; i++) {
nelly_decode_block(s, &buf[i*NELLY_BLOCK_LEN], s->float_buf); nelly_decode_block(s, &buf[i*NELLY_BLOCK_LEN], s->float_buf);