diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-11-21 21:34:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-08 07:38:30 +0100 |
| commit | 759001c534287a96dc96d1e274665feb7059145d (patch) | |
| tree | 6ace9560c20aa30db92067c5b45d7bd86e458d10 /libavcodec/lagarith.c | |
| parent | 6e7b50b4270116ded8b874d76cb7c5b1a0341827 (diff) | |
lavc decoders: work with refcounted frames.
Diffstat (limited to 'libavcodec/lagarith.c')
| -rw-r--r-- | libavcodec/lagarith.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 33dd8b0c53..9d84d263c9 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -48,7 +48,6 @@ enum LagarithFrameType { typedef struct LagarithContext { AVCodecContext *avctx; - AVFrame picture; DSPContext dsp; int zeros; /**< number of consecutive zero bytes encountered */ int zeros_rem; /**< number of zero bytes remaining to output */ @@ -502,19 +501,14 @@ static int lag_decode_frame(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; LagarithContext *l = avctx->priv_data; - AVFrame *const p = &l->picture; + ThreadFrame frame = { .f = data }; + AVFrame *const p = data; uint8_t frametype = 0; uint32_t offset_gu = 0, offset_bv = 0, offset_ry = 9; uint32_t offs[4]; uint8_t *srcs[4], *dst; int i, j, planes = 3; - AVFrame *picture = data; - - if (p->data[0]) - ff_thread_release_buffer(avctx, p); - - p->reference = 0; p->key_frame = 1; frametype = buf[0]; @@ -526,7 +520,7 @@ static int lag_decode_frame(AVCodecContext *avctx, case FRAME_SOLID_RGBA: avctx->pix_fmt = AV_PIX_FMT_RGB32; - if (ff_thread_get_buffer(avctx, p) < 0) { + if (ff_thread_get_buffer(avctx, &frame, 0) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } @@ -548,7 +542,7 @@ static int lag_decode_frame(AVCodecContext *avctx, if (frametype == FRAME_ARITH_RGB24 || frametype == FRAME_U_RGB24) avctx->pix_fmt = AV_PIX_FMT_RGB24; - if (ff_thread_get_buffer(avctx, p) < 0) { + if (ff_thread_get_buffer(avctx, &frame, 0) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } @@ -608,7 +602,7 @@ static int lag_decode_frame(AVCodecContext *avctx, case FRAME_ARITH_YUY2: avctx->pix_fmt = AV_PIX_FMT_YUV422P; - if (ff_thread_get_buffer(avctx, p) < 0) { + if (ff_thread_get_buffer(avctx, &frame, 0) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } @@ -634,7 +628,7 @@ static int lag_decode_frame(AVCodecContext *avctx, case FRAME_ARITH_YV12: avctx->pix_fmt = AV_PIX_FMT_YUV420P; - if (ff_thread_get_buffer(avctx, p) < 0) { + if (ff_thread_get_buffer(avctx, &frame, 0) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } @@ -663,7 +657,6 @@ static int lag_decode_frame(AVCodecContext *avctx, return -1; } - *picture = *p; *got_frame = 1; return buf_size; @@ -683,8 +676,6 @@ static av_cold int lag_decode_end(AVCodecContext *avctx) { LagarithContext *l = avctx->priv_data; - if (l->picture.data[0]) - ff_thread_release_buffer(avctx, &l->picture); av_freep(&l->rgb_planes); return 0; |