mxfdec: Compute packet offsets properly.

[ffmpeg] / libavcodec / 8svx.c

diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index a7b9c86065c596d9a7aa34f253fc5c71729d4b98..4f11b8bec4c40dacf3218bb872e6ed74c958e9e6 100644 (file)
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -32,6 +32,7 @@
 
 /** decoder context */
 typedef struct EightSvxContext {
+    AVFrame frame;
     uint8_t fib_acc[2];
     const int8_t *table;
 
@@ -73,20 +74,31 @@ static void delta_decode(uint8_t *dst, const uint8_t *src, int src_size,
     *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)
 {
     EightSvxContext *esc = avctx->priv_data;
     int buf_size;
-    uint8_t *out_data = data;
-    int out_data_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 chan_size = (avpkt->size / avctx->channels) - 2;
+        int hdr_size  = is_compr ? 2 : 0;
+        int chan_size = (avpkt->size - hdr_size * avctx->channels) / avctx->channels;
 
-        if (avpkt->size < 2) {
+        if (avpkt->size < hdr_size * avctx->channels) {
             av_log(avctx, AV_LOG_ERROR, "packet size is too small\n");
             return AVERROR(EINVAL);
         }
@@ -95,9 +107,11 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, int *data_si
             return AVERROR(EINVAL);
         }
 
+        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;
@@ -109,9 +123,9 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, int *data_si
                 return AVERROR(ENOMEM);
             }
         }
-        memcpy(esc->data[0], &avpkt->data[2], chan_size);
+        memcpy(esc->data[0], &avpkt->data[hdr_size], chan_size);
         if (avctx->channels == 2)
-            memcpy(esc->data[1], &avpkt->data[2+chan_size+2], chan_size);
+            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");
@@ -121,23 +135,36 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, int *data_si
     /* decode next piece of data from the buffer */
     buf_size = FFMIN(MAX_FRAME_SIZE, esc->data_size - esc->data_idx);
     if (buf_size <= 0) {
-        *data_size = 0;
+        *got_frame_ptr = 0;
         return avpkt->size;
     }
-    out_data_size = buf_size * 2 * avctx->channels;
-    if (*data_size < out_data_size) {
-        av_log(avctx, AV_LOG_ERROR, "Provided buffer with size %d is too small.\n",
-               *data_size);
-        return AVERROR(EINVAL);
+
+    /* 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];
+
+    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;
-    *data_size = out_data_size;
+
+    *got_frame_ptr   = 1;
+    *(AVFrame *)data = esc->frame;
 
     return avpkt->size;
 }
@@ -159,10 +186,16 @@ 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 = AV_SAMPLE_FMT_U8;
+
+    avcodec_get_frame_defaults(&esc->frame);
+    avctx->coded_frame = &esc->frame;
+
     return 0;
 }
 
@@ -184,7 +217,7 @@ AVCodec ff_eightsvx_fib_decoder = {
   .init           = eightsvx_decode_init,
   .close          = eightsvx_decode_close,
   .decode         = eightsvx_decode_frame,
-  .capabilities   = CODEC_CAP_DELAY,
+  .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_DR1,
   .long_name      = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
 };
 
@@ -196,6 +229,18 @@ AVCodec ff_eightsvx_exp_decoder = {
   .init           = eightsvx_decode_init,
   .close          = eightsvx_decode_close,
   .decode         = eightsvx_decode_frame,
-  .capabilities   = CODEC_CAP_DELAY,
+  .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"),
+};