Imported Upstream version 6.1

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

diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c
index a2ab66d..1faac7c 100644 (file)
--- a/libavcodec/v408enc.c
+++ b/libavcodec/v408enc.c
@@ -20,8 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
+#include "codec_internal.h"
+#include "encode.h"
 #include "internal.h"
 
 static av_cold int v408_encode_init(AVCodecContext *avctx)
@@ -29,6 +33,11 @@ static av_cold int v408_encode_init(AVCodecContext *avctx)
     avctx->bits_per_coded_sample = 32;
     avctx->bit_rate = ff_guess_coded_bitrate(avctx);
 
+#if FF_API_AYUV_CODECID
+    if (avctx->codec_id == AV_CODEC_ID_AYUV)
+        av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated and will be removed.\n");
+#endif
+
     return 0;
 }
 
@@ -36,10 +45,11 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                              const AVFrame *pic, int *got_packet)
 {
     uint8_t *dst;
-    uint8_t *y, *u, *v, *a;
+    const uint8_t *y, *u, *v, *a;
     int i, j, ret;
 
-    if ((ret = ff_alloc_packet2(avctx, pkt, avctx->width * avctx->height * 4, 0)) < 0)
+    ret = ff_get_encode_buffer(avctx, pkt, avctx->width * avctx->height * 4, 0);
+    if (ret < 0)
         return ret;
     dst = pkt->data;
 
@@ -50,12 +60,15 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 
     for (i = 0; i < avctx->height; i++) {
         for (j = 0; j < avctx->width; j++) {
+#if FF_API_AYUV_CODECID
            if (avctx->codec_id==AV_CODEC_ID_AYUV) {
                 *dst++ = v[j];
                 *dst++ = u[j];
                 *dst++ = y[j];
                 *dst++ = a[j];
-            } else {
+            } else
+#endif
+            {
                 *dst++ = u[j];
                 *dst++ = y[j];
                 *dst++ = v[j];
@@ -68,37 +81,35 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         a += pic->linesize[3];
     }
 
-    pkt->flags |= AV_PKT_FLAG_KEY;
     *got_packet = 1;
     return 0;
 }
 
-static av_cold int v408_encode_close(AVCodecContext *avctx)
-{
-    return 0;
-}
+static const enum AVPixelFormat pix_fmt[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE };
 
+#if FF_API_AYUV_CODECID
 #if CONFIG_AYUV_ENCODER
-AVCodec ff_ayuv_encoder = {
-    .name         = "ayuv",
-    .long_name    = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"),
-    .type         = AVMEDIA_TYPE_VIDEO,
-    .id           = AV_CODEC_ID_AYUV,
+const FFCodec ff_ayuv_encoder = {
+    .p.name       = "ayuv",
+    CODEC_LONG_NAME("Uncompressed packed MS 4:4:4:4"),
+    .p.type       = AVMEDIA_TYPE_VIDEO,
+    .p.id         = AV_CODEC_ID_AYUV,
+    .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
     .init         = v408_encode_init,
-    .encode2      = v408_encode_frame,
-    .close        = v408_encode_close,
-    .pix_fmts     = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE },
+    FF_CODEC_ENCODE_CB(v408_encode_frame),
+    .p.pix_fmts   = pix_fmt,
 };
 #endif
+#endif
 #if CONFIG_V408_ENCODER
-AVCodec ff_v408_encoder = {
-    .name         = "v408",
-    .long_name    = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"),
-    .type         = AVMEDIA_TYPE_VIDEO,
-    .id           = AV_CODEC_ID_V408,
+const FFCodec ff_v408_encoder = {
+    .p.name       = "v408",
+    CODEC_LONG_NAME("Uncompressed packed QT 4:4:4:4"),
+    .p.type       = AVMEDIA_TYPE_VIDEO,
+    .p.id         = AV_CODEC_ID_V408,
+    .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
     .init         = v408_encode_init,
-    .encode2      = v408_encode_frame,
-    .close        = v408_encode_close,
-    .pix_fmts     = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE },
+    FF_CODEC_ENCODE_CB(v408_encode_frame),
+    .p.pix_fmts   = pix_fmt,
 };
 #endif