Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavcodec / yuv4dec.c

diff --git a/libavcodec/yuv4dec.c b/libavcodec/yuv4dec.c
index 0769669..ad83a21 100644 (file)
--- a/libavcodec/yuv4dec.c
+++ b/libavcodec/yuv4dec.c
@@ -21,45 +21,32 @@
  */
 
 #include "avcodec.h"
+#include "codec_internal.h"
+#include "decode.h"
 
 static av_cold int yuv4_decode_init(AVCodecContext *avctx)
 {
-    avctx->pix_fmt = PIX_FMT_YUV420P;
-
-    avctx->coded_frame = avcodec_alloc_frame();
-
-    if (!avctx->coded_frame) {
-        av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
-        return AVERROR(ENOMEM);
-    }
+    avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 
     return 0;
 }
 
-static int yuv4_decode_frame(AVCodecContext *avctx, void *data,
-                             int *data_size, AVPacket *avpkt)
+static int yuv4_decode_frame(AVCodecContext *avctx, AVFrame *pic,
+                             int *got_frame, AVPacket *avpkt)
 {
-    AVFrame *pic = avctx->coded_frame;
     const uint8_t *src = avpkt->data;
     uint8_t *y, *u, *v;
-    int i, j;
-
-    if (pic->data[0])
-        avctx->release_buffer(avctx, pic);
+    int i, j, ret;
 
     if (avpkt->size < 6 * (avctx->width + 1 >> 1) * (avctx->height + 1 >> 1)) {
         av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n");
         return AVERROR(EINVAL);
     }
 
-    pic->reference = 0;
-
-    if (avctx->get_buffer(avctx, pic) < 0) {
-        av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
-        return AVERROR(ENOMEM);
-    }
+    if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+        return ret;
 
-    pic->key_frame = 1;
+    pic->flags |= AV_FRAME_FLAG_KEY;
     pic->pict_type = AV_PICTURE_TYPE_I;
 
     y = pic->data[0];
@@ -81,29 +68,17 @@ static int yuv4_decode_frame(AVCodecContext *avctx, void *data,
         v +=     pic->linesize[2];
     }
 
-    *data_size = sizeof(AVFrame);
-    *(AVFrame *)data = *pic;
+    *got_frame = 1;
 
     return avpkt->size;
 }
 
-static av_cold int yuv4_decode_close(AVCodecContext *avctx)
-{
-    if (avctx->coded_frame->data[0])
-        avctx->release_buffer(avctx, avctx->coded_frame);
-
-    av_freep(&avctx->coded_frame);
-
-    return 0;
-}
-
-AVCodec ff_yuv4_decoder = {
-    .name         = "yuv4",
-    .type         = AVMEDIA_TYPE_VIDEO,
-    .id           = AV_CODEC_ID_YUV4,
+const FFCodec ff_yuv4_decoder = {
+    .p.name       = "yuv4",
+    CODEC_LONG_NAME("Uncompressed packed 4:2:0"),
+    .p.type       = AVMEDIA_TYPE_VIDEO,
+    .p.id         = AV_CODEC_ID_YUV4,
     .init         = yuv4_decode_init,
-    .decode       = yuv4_decode_frame,
-    .close        = yuv4_decode_close,
-    .capabilities = CODEC_CAP_DR1,
-    .long_name    = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"),
+    FF_CODEC_DECODE_CB(yuv4_decode_frame),
+    .p.capabilities = AV_CODEC_CAP_DR1,
 };