Deprecate avctx.coded_frame

[ffmpeg] / libavcodec / rawenc.c

diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index ccee4b3e10dd9abf00275cb592ff1bdd8c893aaa..cc55b3a875d1eaea65bb7feddba3527ecab01406 100644 (file)
--- a/libavcodec/rawenc.c
+++ b/libavcodec/rawenc.c
@@ -2,54 +2,81 @@
  * Raw Video Encoder
  * Copyright (c) 2001 Fabrice Bellard
  *
- * 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 rawenc.c
+ * @file
  * Raw Video Encoder
  */
 
 #include "avcodec.h"
 #include "raw.h"
+#include "internal.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/internal.h"
 
-static av_cold int raw_init_encoder(AVCodecContext *avctx)
+static av_cold int raw_encode_init(AVCodecContext *avctx)
 {
-    avctx->coded_frame = (AVFrame *)avctx->priv_data;
-    avctx->coded_frame->pict_type = FF_I_TYPE;
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
     avctx->coded_frame->key_frame = 1;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+    avctx->bits_per_coded_sample = av_get_bits_per_pixel(desc);
     if(!avctx->codec_tag)
         avctx->codec_tag = avcodec_pix_fmt_to_codec_tag(avctx->pix_fmt);
     return 0;
 }
 
-static int raw_encode(AVCodecContext *avctx,
-                            unsigned char *frame, int buf_size, void *data)
+static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
+                      const AVFrame *frame, int *got_packet)
 {
-    return avpicture_layout((AVPicture *)data, avctx->pix_fmt, avctx->width,
-                                               avctx->height, frame, buf_size);
+    int ret = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
+
+    if (ret < 0)
+        return ret;
+
+    if ((ret = ff_alloc_packet(pkt, ret)) < 0)
+        return ret;
+    if ((ret = avpicture_layout((const AVPicture *)frame, avctx->pix_fmt, avctx->width,
+                                avctx->height, pkt->data, pkt->size)) < 0)
+        return ret;
+
+    if(avctx->codec_tag == AV_RL32("yuv2") && ret > 0 &&
+       avctx->pix_fmt   == AV_PIX_FMT_YUYV422) {
+        int x;
+        for(x = 1; x < avctx->height*avctx->width*2; x += 2)
+            pkt->data[x] ^= 0x80;
+    }
+    pkt->flags |= AV_PKT_FLAG_KEY;
+    *got_packet = 1;
+    return 0;
 }
 
-AVCodec rawvideo_encoder = {
-    "rawvideo",
-    CODEC_TYPE_VIDEO,
-    CODEC_ID_RAWVIDEO,
-    sizeof(AVFrame),
-    raw_init_encoder,
-    raw_encode,
-    .long_name = NULL_IF_CONFIG_SMALL("raw video"),
+AVCodec ff_rawvideo_encoder = {
+    .name           = "rawvideo",
+    .long_name      = NULL_IF_CONFIG_SMALL("raw video"),
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_RAWVIDEO,
+    .init           = raw_encode_init,
+    .encode2        = raw_encode,
 };