[002/124] rawdec: convert to refcounted frames.

Message ID 1357655896-21911-3-git-send-email-anton@khirnov.net
State Superseded
Headers show

Commit Message

Anton Khirnov Jan. 8, 2013, 2:36 p.m.
---
 libavcodec/rawdec.c |   95 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 64 insertions(+), 31 deletions(-)

Comments

Janne Grunau Feb. 15, 2013, 10:44 a.m. | #1
On 2013-01-08 15:36:14 +0100, Anton Khirnov wrote:
> ---
>  libavcodec/rawdec.c |   95 ++++++++++++++++++++++++++++++++++-----------------
>  1 file changed, 64 insertions(+), 31 deletions(-)
> 
> diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
> index 77d6d1f..188a824 100644
> --- a/libavcodec/rawdec.c
> +++ b/libavcodec/rawdec.c
> @@ -26,16 +26,17 @@
>  
>  #include "avcodec.h"
>  #include "raw.h"
> +#include "libavutil/buffer.h"
>  #include "libavutil/common.h"
>  #include "libavutil/intreadwrite.h"
>  #include "libavutil/imgutils.h"
>  
>  typedef struct RawVideoContext {
> -    uint32_t palette[AVPALETTE_COUNT];
> -    unsigned char *buffer;  /* block of memory for holding one frame */
> -    int            length;  /* number of bytes in buffer */
> +    AVBufferRef *palette;
> +    int frame_size;  /* size of the frame in bytes */
>      int flip;
> -    AVFrame pic;             ///< AVCodecContext.coded_frame
> +    int is_2_4_bpp; // 2 or 4 bpp raw in avi/mov
> +    int is_yuv2;
>  } RawVideoContext;
>  
>  static const PixelFormatTag pix_fmt_bps_avi[] = {
> @@ -77,6 +78,7 @@ static enum AVPixelFormat find_pix_fmt(const PixelFormatTag *tags,
>  static av_cold int raw_init_decoder(AVCodecContext *avctx)
>  {
>      RawVideoContext *context = avctx->priv_data;
> +    const AVPixFmtDescriptor *desc;
>  
>      if (avctx->codec_tag == MKTAG('r','a','w',' '))
>          avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_mov,
> @@ -90,20 +92,28 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
>          avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi,
>                                        avctx->bits_per_coded_sample);
>  
> -    avpriv_set_systematic_pal2(context->palette, avctx->pix_fmt);
> -    context->length = avpicture_get_size(avctx->pix_fmt, avctx->width,
> -                                         avctx->height);
> -    if ((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
> -        avctx->pix_fmt == AV_PIX_FMT_PAL8 &&
> -       (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))) {
> -        context->buffer = av_malloc(context->length);
> -        if (!context->buffer)
> -            return -1;
> +    desc = av_pix_fmt_desc_get(avctx->pix_fmt);
> +    if (!desc) {
> +        av_log(avctx, AV_LOG_ERROR, "Invalid pixel format.\n");
> +        return AVERROR(EINVAL);
> +    }
> +
> +    if (desc->flags & (PIX_FMT_PAL || PIX_FMT_PSEUDOPAL)) {
> +        context->palette = av_buffer_alloc(AVPALETTE_SIZE);
> +        if (!context->palette)
> +            return AVERROR(ENOMEM);
> +        if (desc->flags & PIX_FMT_PSEUDOPAL)
> +            avpriv_set_systematic_pal2((uint32_t*)context->palette->data, avctx->pix_fmt);
> +        else
> +            memset(context->palette->data, 0, AVPALETTE_SIZE);
>      }
> -    context->pic.pict_type = AV_PICTURE_TYPE_I;
> -    context->pic.key_frame = 1;
>  
> -    avctx->coded_frame = &context->pic;
> +    context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width,
> +                                             avctx->height);
> +    if ((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
> +        avctx->pix_fmt == AV_PIX_FMT_PAL8 &&
> +       (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' ')))
> +        context->is_2_4_bpp = 1;
>  
>      if ((avctx->extradata_size >= 9 &&
>           !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) ||
> @@ -111,6 +121,10 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
>          avctx->codec_tag == MKTAG('W','R','A','W'))
>          context->flip = 1;
>  
> +    if (avctx->codec_tag == AV_RL32("yuv2") &&
> +        avctx->pix_fmt   == AV_PIX_FMT_YUYV422)
> +        context->is_yuv2 = 1;
> +
>      return 0;
>  }
>  
> @@ -127,26 +141,33 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
>      RawVideoContext *context       = avctx->priv_data;
>      const uint8_t *buf             = avpkt->data;
>      int buf_size                   = avpkt->size;
> +    int need_copy                  = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2;
>      int res;
>  
>      AVFrame   *frame   = data;
>      AVPicture *picture = data;
>  
> -    frame->pict_type        = avctx->coded_frame->pict_type;
> -    frame->interlaced_frame = avctx->coded_frame->interlaced_frame;
> -    frame->top_field_first  = avctx->coded_frame->top_field_first;
> +    frame->pict_type        = AV_PICTURE_TYPE_I;
> +    frame->key_frame        = 1;
>      frame->reordered_opaque = avctx->reordered_opaque;
>      frame->pkt_pts          = avctx->pkt->pts;
>  
> -    if (buf_size < context->length - (avctx->pix_fmt == AV_PIX_FMT_PAL8 ?
> -                                      AVPALETTE_SIZE : 0))
> +    if (buf_size < context->frame_size - (avctx->pix_fmt == AV_PIX_FMT_PAL8 ?
> +                                          AVPALETTE_SIZE : 0))
>          return -1;
>  
> +    if (need_copy)
> +        frame->buf[0] = av_buffer_alloc(context->frame_size);
> +    else
> +        frame->buf[0] = av_buffer_ref(avpkt->buf);
> +    if (!frame->buf[0])
> +        return AVERROR(ENOMEM);
> +
>      //2bpp and 4bpp raw in avi and mov (yes this is ugly ...)
> -    if (context->buffer) {
> +    if (context->is_2_4_bpp) {
>          int i;
> -        uint8_t *dst = context->buffer;
> -        buf_size = context->length - AVPALETTE_SIZE;
> +        uint8_t *dst = frame->buf[0]->data;
> +        buf_size = context->frame_size - AVPALETTE_SIZE;
>          if (avctx->bits_per_coded_sample == 4) {
>              for (i = 0; 2 * i + 1 < buf_size; i++) {
>                  dst[2 * i + 0] = buf[i] >> 4;
> @@ -161,28 +182,40 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
>              }
>          }
>          buf = dst;
> +    } else if (need_copy) {
> +        memcpy(frame->buf[0]->data, buf, FFMIN(buf_size, context->frame_size));
> +        buf = frame->buf[0]->data;
>      }
>  
>      if (avctx->codec_tag == MKTAG('A', 'V', '1', 'x') ||
>          avctx->codec_tag == MKTAG('A', 'V', 'u', 'p'))
> -        buf += buf_size - context->length;
> +        buf += buf_size - context->frame_size;
>  
>      if ((res = avpicture_fill(picture, buf, avctx->pix_fmt,
>                                avctx->width, avctx->height)) < 0)
>          return res;
> -    if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->length) ||
> -        (desc->flags & PIX_FMT_PSEUDOPAL)) {
> -        frame->data[1] = context->palette;
> -    }
> +
>      if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
>          const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE,
>                                                       NULL);
>  
>          if (pal) {
> -            memcpy(frame->data[1], pal, AVPALETTE_SIZE);
> +            av_buffer_unref(&context->palette);
> +            context->palette = av_buffer_alloc(AVPALETTE_SIZE);
> +            if (!context->palette)
> +                return AVERROR(ENOMEM);
> +            memcpy(context->palette->data, pal, AVPALETTE_SIZE);
>              frame->palette_has_changed = 1;
>          }
>      }
> +
> +    if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) ||
> +        (desc->flags & PIX_FMT_PSEUDOPAL)) {
> +        frame->buf[1]  = av_buffer_ref(context->palette);
> +        if (!frame->buf[1])
> +            return AVERROR(ENOMEM);
> +        frame->data[1] = frame->buf[1]->data;
> +    }
>      if (avctx->pix_fmt == AV_PIX_FMT_BGR24 &&
>          ((frame->linesize[0] + 3) & ~3) * avctx->height <= buf_size)
>          frame->linesize[0] = (frame->linesize[0] + 3) & ~3;
> @@ -215,7 +248,7 @@ static av_cold int raw_close_decoder(AVCodecContext *avctx)
>  {
>      RawVideoContext *context = avctx->priv_data;
>  
> -    av_freep(&context->buffer);
> +    av_buffer_unref(&context->palette);
>      return 0;
>  }

looks ok

Janne

Patch

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 77d6d1f..188a824 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -26,16 +26,17 @@ 
 
 #include "avcodec.h"
 #include "raw.h"
+#include "libavutil/buffer.h"
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/imgutils.h"
 
 typedef struct RawVideoContext {
-    uint32_t palette[AVPALETTE_COUNT];
-    unsigned char *buffer;  /* block of memory for holding one frame */
-    int            length;  /* number of bytes in buffer */
+    AVBufferRef *palette;
+    int frame_size;  /* size of the frame in bytes */
     int flip;
-    AVFrame pic;             ///< AVCodecContext.coded_frame
+    int is_2_4_bpp; // 2 or 4 bpp raw in avi/mov
+    int is_yuv2;
 } RawVideoContext;
 
 static const PixelFormatTag pix_fmt_bps_avi[] = {
@@ -77,6 +78,7 @@  static enum AVPixelFormat find_pix_fmt(const PixelFormatTag *tags,
 static av_cold int raw_init_decoder(AVCodecContext *avctx)
 {
     RawVideoContext *context = avctx->priv_data;
+    const AVPixFmtDescriptor *desc;
 
     if (avctx->codec_tag == MKTAG('r','a','w',' '))
         avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_mov,
@@ -90,20 +92,28 @@  static av_cold int raw_init_decoder(AVCodecContext *avctx)
         avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi,
                                       avctx->bits_per_coded_sample);
 
-    avpriv_set_systematic_pal2(context->palette, avctx->pix_fmt);
-    context->length = avpicture_get_size(avctx->pix_fmt, avctx->width,
-                                         avctx->height);
-    if ((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
-        avctx->pix_fmt == AV_PIX_FMT_PAL8 &&
-       (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))) {
-        context->buffer = av_malloc(context->length);
-        if (!context->buffer)
-            return -1;
+    desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+    if (!desc) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid pixel format.\n");
+        return AVERROR(EINVAL);
+    }
+
+    if (desc->flags & (PIX_FMT_PAL || PIX_FMT_PSEUDOPAL)) {
+        context->palette = av_buffer_alloc(AVPALETTE_SIZE);
+        if (!context->palette)
+            return AVERROR(ENOMEM);
+        if (desc->flags & PIX_FMT_PSEUDOPAL)
+            avpriv_set_systematic_pal2((uint32_t*)context->palette->data, avctx->pix_fmt);
+        else
+            memset(context->palette->data, 0, AVPALETTE_SIZE);
     }
-    context->pic.pict_type = AV_PICTURE_TYPE_I;
-    context->pic.key_frame = 1;
 
-    avctx->coded_frame = &context->pic;
+    context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width,
+                                             avctx->height);
+    if ((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
+        avctx->pix_fmt == AV_PIX_FMT_PAL8 &&
+       (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' ')))
+        context->is_2_4_bpp = 1;
 
     if ((avctx->extradata_size >= 9 &&
          !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) ||
@@ -111,6 +121,10 @@  static av_cold int raw_init_decoder(AVCodecContext *avctx)
         avctx->codec_tag == MKTAG('W','R','A','W'))
         context->flip = 1;
 
+    if (avctx->codec_tag == AV_RL32("yuv2") &&
+        avctx->pix_fmt   == AV_PIX_FMT_YUYV422)
+        context->is_yuv2 = 1;
+
     return 0;
 }
 
@@ -127,26 +141,33 @@  static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
     RawVideoContext *context       = avctx->priv_data;
     const uint8_t *buf             = avpkt->data;
     int buf_size                   = avpkt->size;
+    int need_copy                  = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2;
     int res;
 
     AVFrame   *frame   = data;
     AVPicture *picture = data;
 
-    frame->pict_type        = avctx->coded_frame->pict_type;
-    frame->interlaced_frame = avctx->coded_frame->interlaced_frame;
-    frame->top_field_first  = avctx->coded_frame->top_field_first;
+    frame->pict_type        = AV_PICTURE_TYPE_I;
+    frame->key_frame        = 1;
     frame->reordered_opaque = avctx->reordered_opaque;
     frame->pkt_pts          = avctx->pkt->pts;
 
-    if (buf_size < context->length - (avctx->pix_fmt == AV_PIX_FMT_PAL8 ?
-                                      AVPALETTE_SIZE : 0))
+    if (buf_size < context->frame_size - (avctx->pix_fmt == AV_PIX_FMT_PAL8 ?
+                                          AVPALETTE_SIZE : 0))
         return -1;
 
+    if (need_copy)
+        frame->buf[0] = av_buffer_alloc(context->frame_size);
+    else
+        frame->buf[0] = av_buffer_ref(avpkt->buf);
+    if (!frame->buf[0])
+        return AVERROR(ENOMEM);
+
     //2bpp and 4bpp raw in avi and mov (yes this is ugly ...)
-    if (context->buffer) {
+    if (context->is_2_4_bpp) {
         int i;
-        uint8_t *dst = context->buffer;
-        buf_size = context->length - AVPALETTE_SIZE;
+        uint8_t *dst = frame->buf[0]->data;
+        buf_size = context->frame_size - AVPALETTE_SIZE;
         if (avctx->bits_per_coded_sample == 4) {
             for (i = 0; 2 * i + 1 < buf_size; i++) {
                 dst[2 * i + 0] = buf[i] >> 4;
@@ -161,28 +182,40 @@  static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
             }
         }
         buf = dst;
+    } else if (need_copy) {
+        memcpy(frame->buf[0]->data, buf, FFMIN(buf_size, context->frame_size));
+        buf = frame->buf[0]->data;
     }
 
     if (avctx->codec_tag == MKTAG('A', 'V', '1', 'x') ||
         avctx->codec_tag == MKTAG('A', 'V', 'u', 'p'))
-        buf += buf_size - context->length;
+        buf += buf_size - context->frame_size;
 
     if ((res = avpicture_fill(picture, buf, avctx->pix_fmt,
                               avctx->width, avctx->height)) < 0)
         return res;
-    if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->length) ||
-        (desc->flags & PIX_FMT_PSEUDOPAL)) {
-        frame->data[1] = context->palette;
-    }
+
     if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
         const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE,
                                                      NULL);
 
         if (pal) {
-            memcpy(frame->data[1], pal, AVPALETTE_SIZE);
+            av_buffer_unref(&context->palette);
+            context->palette = av_buffer_alloc(AVPALETTE_SIZE);
+            if (!context->palette)
+                return AVERROR(ENOMEM);
+            memcpy(context->palette->data, pal, AVPALETTE_SIZE);
             frame->palette_has_changed = 1;
         }
     }
+
+    if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) ||
+        (desc->flags & PIX_FMT_PSEUDOPAL)) {
+        frame->buf[1]  = av_buffer_ref(context->palette);
+        if (!frame->buf[1])
+            return AVERROR(ENOMEM);
+        frame->data[1] = frame->buf[1]->data;
+    }
     if (avctx->pix_fmt == AV_PIX_FMT_BGR24 &&
         ((frame->linesize[0] + 3) & ~3) * avctx->height <= buf_size)
         frame->linesize[0] = (frame->linesize[0] + 3) & ~3;
@@ -215,7 +248,7 @@  static av_cold int raw_close_decoder(AVCodecContext *avctx)
 {
     RawVideoContext *context = avctx->priv_data;
 
-    av_freep(&context->buffer);
+    av_buffer_unref(&context->palette);
     return 0;
 }