X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2F8svx.c;h=4f11b8bec4c40dacf3218bb872e6ed74c958e9e6;hb=ec104eef51d16974f7d90dfb2ab705df3f47e6bb;hp=c139e5d40b3aa1e403230b6811c1bb0cbe7d4819;hpb=7a00bbad2100367481240e62876b941b5c4befdc;p=ffmpeg

diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index c139e5d40b3..4f11b8bec4c 100644
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -2,27 +2,28 @@
  * 8SVX audio decoder
  * Copyright (C) 2008 Jaikrishnan Menon
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file libavcodec/8svx.c
+ * @file
  * 8svx audio decoder
  * @author Jaikrishnan Menon
+ *
  * supports: fibonacci delta encoding
  *         : exponential encoding
  */
@@ -31,46 +32,141 @@
 
 /** decoder context */
 typedef struct EightSvxContext {
-    int16_t fib_acc;
-    const int16_t *table;
+    AVFrame frame;
+    uint8_t fib_acc[2];
+    const int8_t *table;
+
+    /* buffer used to store the whole first packet.
+       data is only sent as one large packet */
+    uint8_t *data[2];
+    int data_size;
+    int data_idx;
 } EightSvxContext;
 
-static const int16_t fibonacci[16]   = { -34<<8, -21<<8, -13<<8,  -8<<8, -5<<8, -3<<8, -2<<8, -1<<8,
-                                          0, 1<<8, 2<<8, 3<<8, 5<<8, 8<<8, 13<<8, 21<<8 };
-static const int16_t exponential[16] = { -128<<8, -64<<8, -32<<8, -16<<8, -8<<8, -4<<8, -2<<8, -1<<8,
-                                          0, 1<<8, 2<<8, 4<<8, 8<<8, 16<<8, 32<<8, 64<<8 };
+static const int8_t fibonacci[16]   = { -34, -21, -13,  -8, -5, -3, -2, -1,
+                                          0,   1,   2,   3,  5,  8, 13, 21 };
+static const int8_t exponential[16] = { -128, -64, -32, -16, -8, -4, -2, -1,
+                                           0,   1,   2,   4,  8, 16, 32, 64 };
+
+#define MAX_FRAME_SIZE 32768
+
+/**
+ * Delta decode the compressed values in src, and put the resulting
+ * decoded samples in dst.
+ *
+ * @param[in,out] state starting value. it is saved for use in the next call.
+ */
+static void delta_decode(uint8_t *dst, const uint8_t *src, int src_size,
+                         uint8_t *state, const int8_t *table, int channels)
+{
+    uint8_t val = *state;
+
+    while (src_size--) {
+        uint8_t d = *src++;
+        val = av_clip_uint8(val + table[d & 0xF]);
+        *dst = val;
+        dst += channels;
+        val = av_clip_uint8(val + table[d >> 4]);
+        *dst = val;
+        dst += channels;
+    }
+
+    *state = val;
+}
+
+static void raw_decode(uint8_t *dst, const int8_t *src, int src_size,
+                       int channels)
+{
+    while (src_size--) {
+        *dst = *src++ + 128;
+        dst += channels;
+    }
+}
 
 /** decode a frame */
-static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
-                                 AVPacket *avpkt)
+static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
+                                 int *got_frame_ptr, AVPacket *avpkt)
 {
-    const uint8_t *buf = avpkt->data;
-    int buf_size = avpkt->size;
     EightSvxContext *esc = avctx->priv_data;
-    int16_t *out_data = data;
-    int consumed = buf_size;
-    const uint8_t *buf_end = buf + buf_size;
+    int buf_size;
+    uint8_t *out_data;
+    int ret;
+    int is_compr = (avctx->codec_id != CODEC_ID_PCM_S8_PLANAR);
+
+    /* for the first packet, copy data to buffer */
+    if (avpkt->data) {
+        int hdr_size  = is_compr ? 2 : 0;
+        int chan_size = (avpkt->size - hdr_size * avctx->channels) / avctx->channels;
 
-    if((*data_size >> 2) < buf_size)
-        return -1;
+        if (avpkt->size < hdr_size * avctx->channels) {
+            av_log(avctx, AV_LOG_ERROR, "packet size is too small\n");
+            return AVERROR(EINVAL);
+        }
+        if (esc->data[0]) {
+            av_log(avctx, AV_LOG_ERROR, "unexpected data after first packet\n");
+            return AVERROR(EINVAL);
+        }
 
-    if(avctx->frame_number == 0) {
-        esc->fib_acc = buf[1] << 8;
-        buf_size -= 2;
-        buf += 2;
+        if (is_compr) {
+        esc->fib_acc[0] = avpkt->data[1] + 128;
+        if (avctx->channels == 2)
+            esc->fib_acc[1] = avpkt->data[2+chan_size+1] + 128;
+        }
+
+        esc->data_idx  = 0;
+        esc->data_size = chan_size;
+        if (!(esc->data[0] = av_malloc(chan_size)))
+            return AVERROR(ENOMEM);
+        if (avctx->channels == 2) {
+            if (!(esc->data[1] = av_malloc(chan_size))) {
+                av_freep(&esc->data[0]);
+                return AVERROR(ENOMEM);
+            }
+        }
+        memcpy(esc->data[0], &avpkt->data[hdr_size], chan_size);
+        if (avctx->channels == 2)
+            memcpy(esc->data[1], &avpkt->data[2*hdr_size+chan_size], chan_size);
+    }
+    if (!esc->data[0]) {
+        av_log(avctx, AV_LOG_ERROR, "unexpected empty packet\n");
+        return AVERROR(EINVAL);
     }
 
-    *data_size = buf_size << 2;
+    /* decode next piece of data from the buffer */
+    buf_size = FFMIN(MAX_FRAME_SIZE, esc->data_size - esc->data_idx);
+    if (buf_size <= 0) {
+        *got_frame_ptr = 0;
+        return avpkt->size;
+    }
+
+    /* get output buffer */
+    esc->frame.nb_samples = buf_size * (is_compr + 1);
+    if ((ret = avctx->get_buffer(avctx, &esc->frame)) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+        return ret;
+    }
+    out_data = esc->frame.data[0];
 
-    while(buf < buf_end) {
-        uint8_t d = *buf++;
-        esc->fib_acc += esc->table[d & 0x0f];
-        *out_data++ = esc->fib_acc;
-        esc->fib_acc += esc->table[d >> 4];
-        *out_data++ = esc->fib_acc;
+    if (is_compr) {
+    delta_decode(out_data, &esc->data[0][esc->data_idx], buf_size,
+                 &esc->fib_acc[0], esc->table, avctx->channels);
+    if (avctx->channels == 2) {
+        delta_decode(&out_data[1], &esc->data[1][esc->data_idx], buf_size,
+                    &esc->fib_acc[1], esc->table, avctx->channels);
     }
+    } else {
+        int ch;
+        for (ch = 0; ch < avctx->channels; ch++) {
+            raw_decode((int8_t *)&out_data[ch], &esc->data[ch][esc->data_idx],
+                       buf_size, avctx->channels);
+        }
+    }
+    esc->data_idx += buf_size;
+
+    *got_frame_ptr   = 1;
+    *(AVFrame *)data = esc->frame;
 
-    return consumed;
+    return avpkt->size;
 }
 
 /** initialize 8svx decoder */
@@ -78,6 +174,11 @@ static av_cold int eightsvx_decode_init(AVCodecContext *avctx)
 {
     EightSvxContext *esc = avctx->priv_data;
 
+    if (avctx->channels < 1 || avctx->channels > 2) {
+        av_log(avctx, AV_LOG_ERROR, "8SVX does not support more than 2 channels\n");
+        return AVERROR(EINVAL);
+    }
+
     switch(avctx->codec->id) {
         case CODEC_ID_8SVX_FIB:
           esc->table = fibonacci;
@@ -85,29 +186,61 @@ static av_cold int eightsvx_decode_init(AVCodecContext *avctx)
         case CODEC_ID_8SVX_EXP:
           esc->table = exponential;
           break;
+        case CODEC_ID_PCM_S8_PLANAR:
+            break;
         default:
           return -1;
     }
-    avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->sample_fmt = AV_SAMPLE_FMT_U8;
+
+    avcodec_get_frame_defaults(&esc->frame);
+    avctx->coded_frame = &esc->frame;
+
     return 0;
 }
 
-AVCodec eightsvx_fib_decoder = {
+static av_cold int eightsvx_decode_close(AVCodecContext *avctx)
+{
+    EightSvxContext *esc = avctx->priv_data;
+
+    av_freep(&esc->data[0]);
+    av_freep(&esc->data[1]);
+
+    return 0;
+}
+
+AVCodec ff_eightsvx_fib_decoder = {
   .name           = "8svx_fib",
-  .type           = CODEC_TYPE_AUDIO,
+  .type           = AVMEDIA_TYPE_AUDIO,
   .id             = CODEC_ID_8SVX_FIB,
   .priv_data_size = sizeof (EightSvxContext),
   .init           = eightsvx_decode_init,
+  .close          = eightsvx_decode_close,
   .decode         = eightsvx_decode_frame,
+  .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_DR1,
   .long_name      = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
 };
 
-AVCodec eightsvx_exp_decoder = {
+AVCodec ff_eightsvx_exp_decoder = {
   .name           = "8svx_exp",
-  .type           = CODEC_TYPE_AUDIO,
+  .type           = AVMEDIA_TYPE_AUDIO,
   .id             = CODEC_ID_8SVX_EXP,
   .priv_data_size = sizeof (EightSvxContext),
   .init           = eightsvx_decode_init,
+  .close          = eightsvx_decode_close,
   .decode         = eightsvx_decode_frame,
+  .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_DR1,
   .long_name      = NULL_IF_CONFIG_SMALL("8SVX exponential"),
 };
+
+AVCodec ff_pcm_s8_planar_decoder = {
+    .name           = "pcm_s8_planar",
+    .type           = AVMEDIA_TYPE_AUDIO,
+    .id             = CODEC_ID_PCM_S8_PLANAR,
+    .priv_data_size = sizeof(EightSvxContext),
+    .init           = eightsvx_decode_init,
+    .close          = eightsvx_decode_close,
+    .decode         = eightsvx_decode_frame,
+    .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+    .long_name      = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"),
+};