From c5d68fbd49b9510b352d83919da05be4b2d12a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 14 Jun 2010 14:06:38 +0000
Subject: [PATCH] nellymoserdec: Simplify calculation of numbers of blocks
Originally committed as revision 23604 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/nellymoserdec.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index 2ada6fd5016..b51be86540b 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -166,25 +166,18 @@ static int decode_tag(AVCodecContext * avctx,
if (buf_size < avctx->block_align)
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) {
av_log(avctx, AV_LOG_DEBUG, "Tag size %d.\n", buf_size);
return buf_size;
}
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++) {
nelly_decode_block(s, &buf[i*NELLY_BLOCK_LEN], s->float_buf);
--
GitLab