[003/124] 4xm: convert to refcounted frames.

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

Commit Message

Anton Khirnov Jan. 8, 2013, 2:36 p.m.
---
 libavcodec/4xm.c |   79 +++++++++++++++++++++++-------------------------------
 1 file changed, 33 insertions(+), 46 deletions(-)

Comments

Janne Grunau Feb. 15, 2013, 10:48 a.m. | #1
On 2013-01-08 15:36:15 +0100, Anton Khirnov wrote:
> ---
>  libavcodec/4xm.c |   79 +++++++++++++++++++++++-------------------------------
>  1 file changed, 33 insertions(+), 46 deletions(-)
> 
> diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
> index 094e851..ff41bde 100644
> --- a/libavcodec/4xm.c
> +++ b/libavcodec/4xm.c
> @@ -24,6 +24,7 @@
>   * 4XM codec.
>   */
>  
> +#include "libavutil/frame.h"
>  #include "libavutil/intreadwrite.h"
>  #include "avcodec.h"
>  #include "bytestream.h"
> @@ -131,7 +132,7 @@ typedef struct CFrameBuffer {
>  typedef struct FourXContext {
>      AVCodecContext *avctx;
>      DSPContext dsp;
> -    AVFrame *current_picture, *last_picture;
> +    AVFrame *last_picture;
>      GetBitContext pre_gb;          ///< ac/dc prefix
>      GetBitContext gb;
>      GetByteContext g;
> @@ -256,15 +257,15 @@ static av_cold void init_vlcs(FourXContext *f)
>      }
>  }
>  
> -static void init_mv(FourXContext *f)
> +static void init_mv(FourXContext *f, int linesize)
>  {
>      int i;
>  
>      for (i = 0; i < 256; i++) {
>          if (f->version > 1)
> -            f->mv[i] = mv[i][0] + mv[i][1] * f->current_picture->linesize[0] / 2;
> +            f->mv[i] = mv[i][0] + mv[i][1] * linesize / 2;
>          else
> -            f->mv[i] = (i & 15) - 8 + ((i >> 4) - 8) * f->current_picture->linesize[0] / 2;
> +            f->mv[i] = (i & 15) - 8 + ((i >> 4) - 8) * linesize / 2;
>      }
>  }
>  
> @@ -385,14 +386,15 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src,
>      }
>  }
>  
> -static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length)
> +static int decode_p_frame(FourXContext *f, AVFrame *frame,
> +                          const uint8_t *buf, int length)
>  {
>      int x, y;
>      const int width  = f->avctx->width;
>      const int height = f->avctx->height;
>      uint16_t *src    = (uint16_t *)f->last_picture->data[0];
> -    uint16_t *dst    = (uint16_t *)f->current_picture->data[0];
> -    const int stride =             f->current_picture->linesize[0] >> 1;
> +    uint16_t *dst    = (uint16_t *)frame->data[0];
> +    const int stride =             frame->linesize[0] >> 1;
>      unsigned int bitstream_size, bytestream_size, wordstream_size, extra,
>                   bytestream_offset, wordstream_offset;
>  
> @@ -435,7 +437,7 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length)
>      bytestream2_init(&f->g, buf + bytestream_offset,
>                       length - bytestream_offset);
>  
> -    init_mv(f);
> +    init_mv(f, frame->linesize[0]);
>  
>      for (y = 0; y < height; y += 8) {
>          for (x = 0; x < width; x += 8)
> @@ -494,12 +496,12 @@ static int decode_i_block(FourXContext *f, DCTELEM *block)
>      return 0;
>  }
>  
> -static inline void idct_put(FourXContext *f, int x, int y)
> +static inline void idct_put(FourXContext *f, AVFrame *frame, int x, int y)
>  {
>      DCTELEM (*block)[64] = f->block;
> -    int stride           = f->current_picture->linesize[0] >> 1;
> +    int stride           = frame->linesize[0] >> 1;
>      int i;
> -    uint16_t *dst = ((uint16_t*)f->current_picture->data[0]) + y * stride + x;
> +    uint16_t *dst = ((uint16_t*)frame->data[0]) + y * stride + x;
>  
>      for (i = 0; i < 4; i++) {
>          block[i][0] += 0x80 * 8 * 8;
> @@ -647,14 +649,14 @@ static int mix(int c0, int c1)
>      return red / 3 * 1024 + green / 3 * 32 + blue / 3;
>  }
>  
> -static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length)
> +static int decode_i2_frame(FourXContext *f, AVFrame *frame, const uint8_t *buf, int length)
>  {
>      int x, y, x2, y2;
>      const int width  = f->avctx->width;
>      const int height = f->avctx->height;
>      const int mbs    = (FFALIGN(width, 16) >> 4) * (FFALIGN(height, 16) >> 4);
> -    uint16_t *dst    = (uint16_t*)f->current_picture->data[0];
> -    const int stride =            f->current_picture->linesize[0]>>1;
> +    uint16_t *dst    = (uint16_t*)frame->data[0];
> +    const int stride =            frame->linesize[0]>>1;
>      GetByteContext g3;
>  
>      if (length < mbs * 8) {
> @@ -693,7 +695,7 @@ static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length)
>      return 0;
>  }
>  
> -static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length)
> +static int decode_i_frame(FourXContext *f, AVFrame *frame, const uint8_t *buf, int length)
>  {
>      int x, y, ret;
>      const int width  = f->avctx->width;
> @@ -743,7 +745,7 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length)
>              if ((ret = decode_i_mb(f)) < 0)
>                  return ret;
>  
> -            idct_put(f, x, y);
> +            idct_put(f, frame, x, y);
>          }
>      }
>  
> @@ -760,7 +762,6 @@ static int decode_frame(AVCodecContext *avctx, void *data,
>      int buf_size          = avpkt->size;
>      FourXContext *const f = avctx->priv_data;
>      AVFrame *picture      = data;
> -    AVFrame *p;
>      int i, frame_4cc, frame_size, ret;
>  
>      frame_4cc = AV_RL32(buf);
> @@ -821,43 +822,34 @@ static int decode_frame(AVCodecContext *avctx, void *data,
>          frame_size = buf_size - 12;
>      }
>  
> -    FFSWAP(AVFrame*, f->current_picture, f->last_picture);
> -
> -    p                  = f->current_picture;
> -    avctx->coded_frame = p;
> -
>      // alternatively we would have to use our own buffer management
>      avctx->flags |= CODEC_FLAG_EMU_EDGE;
>  
> -    if (p->data[0])
> -        avctx->release_buffer(avctx, p);
> -
> -    p->reference = 1;
> -    if ((ret = ff_get_buffer(avctx, p)) < 0) {
> +    if ((ret = ff_get_buffer(avctx, picture, AV_GET_BUFFER_FLAG_REF)) < 0) {
>          av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
>          return ret;
>      }
>  
>      if (frame_4cc == AV_RL32("ifr2")) {
> -        p->pict_type = AV_PICTURE_TYPE_I;
> -        if ((ret = decode_i2_frame(f, buf - 4, frame_size + 4)) < 0)
> +        picture->pict_type = AV_PICTURE_TYPE_I;
> +        if ((ret = decode_i2_frame(f, picture, buf - 4, frame_size + 4)) < 0)
>              return ret;
>      } else if (frame_4cc == AV_RL32("ifrm")) {
> -        p->pict_type = AV_PICTURE_TYPE_I;
> -        if ((ret = decode_i_frame(f, buf, frame_size)) < 0)
> +        picture->pict_type = AV_PICTURE_TYPE_I;
> +        if ((ret = decode_i_frame(f, picture, buf, frame_size)) < 0)
>              return ret;
>      } else if (frame_4cc == AV_RL32("pfrm") || frame_4cc == AV_RL32("pfr2")) {
>          if (!f->last_picture->data[0]) {
> -            f->last_picture->reference = 1;
> -            if ((ret = ff_get_buffer(avctx, f->last_picture)) < 0) {
> +            if ((ret = ff_get_buffer(avctx, f->last_picture,
> +                                     AV_GET_BUFFER_FLAG_REF)) < 0) {
>                  av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
>                  return ret;
>              }
>              memset(f->last_picture->data[0], 0, avctx->height * FFABS(f->last_picture->linesize[0]));
>          }
>  
> -        p->pict_type = AV_PICTURE_TYPE_P;
> -        if ((ret = decode_p_frame(f, buf, frame_size)) < 0)
> +        picture->pict_type = AV_PICTURE_TYPE_P;
> +        if ((ret = decode_p_frame(f, picture, buf, frame_size)) < 0)
>              return ret;
>      } else if (frame_4cc == AV_RL32("snd_")) {
>          av_log(avctx, AV_LOG_ERROR, "ignoring snd_ chunk length:%d\n",
> @@ -867,9 +859,11 @@ static int decode_frame(AVCodecContext *avctx, void *data,
>                 buf_size);
>      }
>  
> -    p->key_frame = p->pict_type == AV_PICTURE_TYPE_I;
> +    picture->key_frame = picture->pict_type == AV_PICTURE_TYPE_I;
>  
> -    *picture   = *p;
> +    av_frame_unref(f->last_picture);
> +    if ((ret = av_frame_ref(f->last_picture, picture)) < 0)
> +        return ret;
>      *got_frame = 1;
>  
>      emms_c();
> @@ -896,10 +890,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
>      else
>          avctx->pix_fmt = AV_PIX_FMT_BGR555;
>  
> -    f->current_picture = avcodec_alloc_frame();
>      f->last_picture    = avcodec_alloc_frame();
> -    if (!f->current_picture || !f->last_picture) {
> -        avcodec_free_frame(&f->current_picture);
> +    if (!f->last_picture) {
>          avcodec_free_frame(&f->last_picture);

unnecessary freeing of a NULL pointer

>          return AVERROR(ENOMEM);
>      }
> @@ -920,12 +912,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
>          f->cfrm[i].allocated_size = 0;
>      }
>      ff_free_vlc(&f->pre_vlc);
> -    if (f->current_picture->data[0])
> -        avctx->release_buffer(avctx, f->current_picture);
> -    if (f->last_picture->data[0])
> -        avctx->release_buffer(avctx, f->last_picture);
> -    avcodec_free_frame(&f->current_picture);
> -    avcodec_free_frame(&f->last_picture);
> +    av_frame_free(&f->last_picture);
>  
>      return 0;
>  }

otherwise ok

Janne

Patch

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 094e851..ff41bde 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -24,6 +24,7 @@ 
  * 4XM codec.
  */
 
+#include "libavutil/frame.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
@@ -131,7 +132,7 @@  typedef struct CFrameBuffer {
 typedef struct FourXContext {
     AVCodecContext *avctx;
     DSPContext dsp;
-    AVFrame *current_picture, *last_picture;
+    AVFrame *last_picture;
     GetBitContext pre_gb;          ///< ac/dc prefix
     GetBitContext gb;
     GetByteContext g;
@@ -256,15 +257,15 @@  static av_cold void init_vlcs(FourXContext *f)
     }
 }
 
-static void init_mv(FourXContext *f)
+static void init_mv(FourXContext *f, int linesize)
 {
     int i;
 
     for (i = 0; i < 256; i++) {
         if (f->version > 1)
-            f->mv[i] = mv[i][0] + mv[i][1] * f->current_picture->linesize[0] / 2;
+            f->mv[i] = mv[i][0] + mv[i][1] * linesize / 2;
         else
-            f->mv[i] = (i & 15) - 8 + ((i >> 4) - 8) * f->current_picture->linesize[0] / 2;
+            f->mv[i] = (i & 15) - 8 + ((i >> 4) - 8) * linesize / 2;
     }
 }
 
@@ -385,14 +386,15 @@  static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src,
     }
 }
 
-static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length)
+static int decode_p_frame(FourXContext *f, AVFrame *frame,
+                          const uint8_t *buf, int length)
 {
     int x, y;
     const int width  = f->avctx->width;
     const int height = f->avctx->height;
     uint16_t *src    = (uint16_t *)f->last_picture->data[0];
-    uint16_t *dst    = (uint16_t *)f->current_picture->data[0];
-    const int stride =             f->current_picture->linesize[0] >> 1;
+    uint16_t *dst    = (uint16_t *)frame->data[0];
+    const int stride =             frame->linesize[0] >> 1;
     unsigned int bitstream_size, bytestream_size, wordstream_size, extra,
                  bytestream_offset, wordstream_offset;
 
@@ -435,7 +437,7 @@  static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length)
     bytestream2_init(&f->g, buf + bytestream_offset,
                      length - bytestream_offset);
 
-    init_mv(f);
+    init_mv(f, frame->linesize[0]);
 
     for (y = 0; y < height; y += 8) {
         for (x = 0; x < width; x += 8)
@@ -494,12 +496,12 @@  static int decode_i_block(FourXContext *f, DCTELEM *block)
     return 0;
 }
 
-static inline void idct_put(FourXContext *f, int x, int y)
+static inline void idct_put(FourXContext *f, AVFrame *frame, int x, int y)
 {
     DCTELEM (*block)[64] = f->block;
-    int stride           = f->current_picture->linesize[0] >> 1;
+    int stride           = frame->linesize[0] >> 1;
     int i;
-    uint16_t *dst = ((uint16_t*)f->current_picture->data[0]) + y * stride + x;
+    uint16_t *dst = ((uint16_t*)frame->data[0]) + y * stride + x;
 
     for (i = 0; i < 4; i++) {
         block[i][0] += 0x80 * 8 * 8;
@@ -647,14 +649,14 @@  static int mix(int c0, int c1)
     return red / 3 * 1024 + green / 3 * 32 + blue / 3;
 }
 
-static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length)
+static int decode_i2_frame(FourXContext *f, AVFrame *frame, const uint8_t *buf, int length)
 {
     int x, y, x2, y2;
     const int width  = f->avctx->width;
     const int height = f->avctx->height;
     const int mbs    = (FFALIGN(width, 16) >> 4) * (FFALIGN(height, 16) >> 4);
-    uint16_t *dst    = (uint16_t*)f->current_picture->data[0];
-    const int stride =            f->current_picture->linesize[0]>>1;
+    uint16_t *dst    = (uint16_t*)frame->data[0];
+    const int stride =            frame->linesize[0]>>1;
     GetByteContext g3;
 
     if (length < mbs * 8) {
@@ -693,7 +695,7 @@  static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length)
     return 0;
 }
 
-static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length)
+static int decode_i_frame(FourXContext *f, AVFrame *frame, const uint8_t *buf, int length)
 {
     int x, y, ret;
     const int width  = f->avctx->width;
@@ -743,7 +745,7 @@  static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length)
             if ((ret = decode_i_mb(f)) < 0)
                 return ret;
 
-            idct_put(f, x, y);
+            idct_put(f, frame, x, y);
         }
     }
 
@@ -760,7 +762,6 @@  static int decode_frame(AVCodecContext *avctx, void *data,
     int buf_size          = avpkt->size;
     FourXContext *const f = avctx->priv_data;
     AVFrame *picture      = data;
-    AVFrame *p;
     int i, frame_4cc, frame_size, ret;
 
     frame_4cc = AV_RL32(buf);
@@ -821,43 +822,34 @@  static int decode_frame(AVCodecContext *avctx, void *data,
         frame_size = buf_size - 12;
     }
 
-    FFSWAP(AVFrame*, f->current_picture, f->last_picture);
-
-    p                  = f->current_picture;
-    avctx->coded_frame = p;
-
     // alternatively we would have to use our own buffer management
     avctx->flags |= CODEC_FLAG_EMU_EDGE;
 
-    if (p->data[0])
-        avctx->release_buffer(avctx, p);
-
-    p->reference = 1;
-    if ((ret = ff_get_buffer(avctx, p)) < 0) {
+    if ((ret = ff_get_buffer(avctx, picture, AV_GET_BUFFER_FLAG_REF)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
     }
 
     if (frame_4cc == AV_RL32("ifr2")) {
-        p->pict_type = AV_PICTURE_TYPE_I;
-        if ((ret = decode_i2_frame(f, buf - 4, frame_size + 4)) < 0)
+        picture->pict_type = AV_PICTURE_TYPE_I;
+        if ((ret = decode_i2_frame(f, picture, buf - 4, frame_size + 4)) < 0)
             return ret;
     } else if (frame_4cc == AV_RL32("ifrm")) {
-        p->pict_type = AV_PICTURE_TYPE_I;
-        if ((ret = decode_i_frame(f, buf, frame_size)) < 0)
+        picture->pict_type = AV_PICTURE_TYPE_I;
+        if ((ret = decode_i_frame(f, picture, buf, frame_size)) < 0)
             return ret;
     } else if (frame_4cc == AV_RL32("pfrm") || frame_4cc == AV_RL32("pfr2")) {
         if (!f->last_picture->data[0]) {
-            f->last_picture->reference = 1;
-            if ((ret = ff_get_buffer(avctx, f->last_picture)) < 0) {
+            if ((ret = ff_get_buffer(avctx, f->last_picture,
+                                     AV_GET_BUFFER_FLAG_REF)) < 0) {
                 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
                 return ret;
             }
             memset(f->last_picture->data[0], 0, avctx->height * FFABS(f->last_picture->linesize[0]));
         }
 
-        p->pict_type = AV_PICTURE_TYPE_P;
-        if ((ret = decode_p_frame(f, buf, frame_size)) < 0)
+        picture->pict_type = AV_PICTURE_TYPE_P;
+        if ((ret = decode_p_frame(f, picture, buf, frame_size)) < 0)
             return ret;
     } else if (frame_4cc == AV_RL32("snd_")) {
         av_log(avctx, AV_LOG_ERROR, "ignoring snd_ chunk length:%d\n",
@@ -867,9 +859,11 @@  static int decode_frame(AVCodecContext *avctx, void *data,
                buf_size);
     }
 
-    p->key_frame = p->pict_type == AV_PICTURE_TYPE_I;
+    picture->key_frame = picture->pict_type == AV_PICTURE_TYPE_I;
 
-    *picture   = *p;
+    av_frame_unref(f->last_picture);
+    if ((ret = av_frame_ref(f->last_picture, picture)) < 0)
+        return ret;
     *got_frame = 1;
 
     emms_c();
@@ -896,10 +890,8 @@  static av_cold int decode_init(AVCodecContext *avctx)
     else
         avctx->pix_fmt = AV_PIX_FMT_BGR555;
 
-    f->current_picture = avcodec_alloc_frame();
     f->last_picture    = avcodec_alloc_frame();
-    if (!f->current_picture || !f->last_picture) {
-        avcodec_free_frame(&f->current_picture);
+    if (!f->last_picture) {
         avcodec_free_frame(&f->last_picture);
         return AVERROR(ENOMEM);
     }
@@ -920,12 +912,7 @@  static av_cold int decode_end(AVCodecContext *avctx)
         f->cfrm[i].allocated_size = 0;
     }
     ff_free_vlc(&f->pre_vlc);
-    if (f->current_picture->data[0])
-        avctx->release_buffer(avctx, f->current_picture);
-    if (f->last_picture->data[0])
-        avctx->release_buffer(avctx, f->last_picture);
-    avcodec_free_frame(&f->current_picture);
-    avcodec_free_frame(&f->last_picture);
+    av_frame_free(&f->last_picture);
 
     return 0;
 }