[FFmpeg-cvslog] adpcm: convert ima_ws to bytestream2.

Ronald S. Bultje git at videolan.org
Tue Mar 20 00:16:50 CET 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Mar 17 14:17:48 2012 -0700| [16b7a5e241e9e1ef861a12509a7c60b57c69bb5d] | committer: Ronald S. Bultje

adpcm: convert ima_ws to bytestream2.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16b7a5e241e9e1ef861a12509a7c60b57c69bb5d
---

 libavcodec/adpcm.c |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 90caf65..4faac6f 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -809,28 +809,29 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
         }
         break;
     case CODEC_ID_ADPCM_IMA_WS:
-        for (channel = 0; channel < avctx->channels; channel++) {
-            const uint8_t *src0;
-            int src_stride;
-            int16_t *smp = samples + channel;
+        if (c->vqa_version == 3) {
+            for (channel = 0; channel < avctx->channels; channel++) {
+                int16_t *smp = samples + channel;
 
-            if (c->vqa_version == 3) {
-                src0 = src + channel * buf_size / 2;
-                src_stride = 1;
-            } else {
-                src0 = src + channel;
-                src_stride = avctx->channels;
+                for (n = nb_samples / 2; n > 0; n--) {
+                    int v = bytestream2_get_byteu(&gb);
+                    *smp = adpcm_ima_expand_nibble(&c->status[channel], v >> 4  , 3);
+                    smp += avctx->channels;
+                    *smp = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3);
+                    smp += avctx->channels;
+                }
             }
+        } else {
             for (n = nb_samples / 2; n > 0; n--) {
-                uint8_t v = *src0;
-                src0 += src_stride;
-                *smp = adpcm_ima_expand_nibble(&c->status[channel], v >> 4  , 3);
-                smp += avctx->channels;
-                *smp = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3);
-                smp += avctx->channels;
+                for (channel = 0; channel < avctx->channels; channel++) {
+                    int v = bytestream2_get_byteu(&gb);
+                    *samples++  = adpcm_ima_expand_nibble(&c->status[channel], v >> 4  , 3);
+                    samples[st] = adpcm_ima_expand_nibble(&c->status[channel], v & 0x0F, 3);
+                }
+                samples += avctx->channels;
             }
         }
-        src = buf + buf_size;
+        bytestream2_seek(&gb, 0, SEEK_END);
         break;
     case CODEC_ID_ADPCM_XA:
         while (buf_size >= 128) {



More information about the ffmpeg-cvslog mailing list