[FFmpeg-cvslog] r23604 - trunk/libavcodec/nellymoserdec.c

[mstorsjo]

Author: mstorsjo
Date: Mon Jun 14 16:06:38 2010
New Revision: 23604

Log:
nellymoserdec: Simplify calculation of numbers of blocks

Modified:
   trunk/libavcodec/nellymoserdec.c

Modified: trunk/libavcodec/nellymoserdec.c
==============================================================================
--- trunk/libavcodec/nellymoserdec.c	Mon Jun 14 14:35:28 2010	(r23603)
+++ trunk/libavcodec/nellymoserdec.c	Mon Jun 14 16:06:38 2010	(r23604)
@@ -166,25 +166,18 @@ static int decode_tag(AVCodecContext * a
     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);