swscale: Provide the right alignment for external mmx asm

[ffmpeg] / libavcodec / 8svx.c

diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index 3e3eae6c870112a1ae15e2fa82ed9c1032c43c7d..328fc65b419da108a6f3717aa9cb73ce1eaf902f 100644 (file)
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -29,9 +29,11 @@
  */
 
 #include "avcodec.h"
+#include "libavutil/common.h"
 
 /** decoder context */
 typedef struct EightSvxContext {
+    AVFrame frame;
     uint8_t fib_acc[2];
     const int8_t *table;
 
@@ -83,14 +85,14 @@ static void raw_decode(uint8_t *dst, const int8_t *src, int src_size,
 }
 
 /** 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;
-    int is_compr = (avctx->codec_id != CODEC_ID_PCM_S8_PLANAR);
+    uint8_t *out_data;
+    int ret;
+    int is_compr = (avctx->codec_id != AV_CODEC_ID_PCM_S8_PLANAR);
 
     /* for the first packet, copy data to buffer */
     if (avpkt->data) {
@@ -134,15 +136,18 @@ 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 * (is_compr + 1) * 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);
@@ -158,7 +163,9 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, int *data_si
         }
     }
     esc->data_idx += buf_size;
-    *data_size = out_data_size;
+
+    *got_frame_ptr   = 1;
+    *(AVFrame *)data = esc->frame;
 
     return avpkt->size;
 }
@@ -174,18 +181,22 @@ static av_cold int eightsvx_decode_init(AVCodecContext *avctx)
     }
 
     switch(avctx->codec->id) {
-        case CODEC_ID_8SVX_FIB:
+        case AV_CODEC_ID_8SVX_FIB:
           esc->table = fibonacci;
           break;
-        case CODEC_ID_8SVX_EXP:
+        case AV_CODEC_ID_8SVX_EXP:
           esc->table = exponential;
           break;
-        case CODEC_ID_PCM_S8_PLANAR:
+        case AV_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;
 }
 
@@ -202,35 +213,35 @@ static av_cold int eightsvx_decode_close(AVCodecContext *avctx)
 AVCodec ff_eightsvx_fib_decoder = {
   .name           = "8svx_fib",
   .type           = AVMEDIA_TYPE_AUDIO,
-  .id             = CODEC_ID_8SVX_FIB,
+  .id             = AV_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,
+  .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_DR1,
   .long_name      = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
 };
 
 AVCodec ff_eightsvx_exp_decoder = {
   .name           = "8svx_exp",
   .type           = AVMEDIA_TYPE_AUDIO,
-  .id             = CODEC_ID_8SVX_EXP,
+  .id             = AV_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,
+  .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,
+    .id             = AV_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,
+    .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_DR1,
     .long_name      = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"),
 };