virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

CrystalHD: Port to ref-counted frame API.

Browse Source 
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Philip Langdale 2013-03-12 21:53:22 -07:00 committed by Michael Niedermayer
parent 19c41c6d8e
commit 21dc9b194f
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavcodec/crystalhd.c
View File

@ -122,7 +122,7 @@ typedef struct OpaqueList {
typedef struct { typedef struct {
AVClass *av_class; AVClass *av_class;
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame pic; AVFrame *pic;
HANDLE dev; HANDLE dev;
uint8_t *orig_extradata; uint8_t *orig_extradata;
@ -324,8 +324,7 @@ static void flush(AVCodecContext *avctx)
priv->skip_next_output = 0; priv->skip_next_output = 0;
priv->decode_wait = BASE_WAIT; priv->decode_wait = BASE_WAIT;
if (priv->pic.data[0]) av_frame_unref (priv->pic);
avctx->release_buffer(avctx, &priv->pic);
/* Flush mode 4 flushes all software and hardware buffers. */ /* Flush mode 4 flushes all software and hardware buffers. */
DtsFlushInput(priv->dev, 4); DtsFlushInput(priv->dev, 4);
@ -362,8 +361,7 @@ static av_cold int uninit(AVCodecContext *avctx)
av_free(priv->sps_pps_buf); av_free(priv->sps_pps_buf);
if (priv->pic.data[0]) av_frame_free (&priv->pic);
avctx->release_buffer(avctx, &priv->pic);
if (priv->head) { if (priv->head) {
OpaqueList *node = priv->head; OpaqueList *node = priv->head;
@ -411,6 +409,7 @@ static av_cold int init(AVCodecContext *avctx)
priv->is_nal = avctx->extradata_size > 0 && *(avctx->extradata) == 1; priv->is_nal = avctx->extradata_size > 0 && *(avctx->extradata) == 1;
priv->last_picture = -1; priv->last_picture = -1;
priv->decode_wait = BASE_WAIT; priv->decode_wait = BASE_WAIT;
priv->pic = av_frame_alloc();
subtype = id2subtype(priv, avctx->codec->id); subtype = id2subtype(priv, avctx->codec->id);
switch (subtype) { switch (subtype) {
@ -635,15 +634,15 @@ static inline CopyRet copy_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_VERBOSE, "Interlaced state: %d | trust_interlaced %d\n", av_log(avctx, AV_LOG_VERBOSE, "Interlaced state: %d | trust_interlaced %d\n",
interlaced, trust_interlaced); interlaced, trust_interlaced);
if (priv->pic.data[0] && !priv->need_second_field) if (priv->pic->data[0] && !priv->need_second_field)
avctx->release_buffer(avctx, &priv->pic); av_frame_unref(priv->pic);
priv->need_second_field = interlaced && !priv->need_second_field; priv->need_second_field = interlaced && !priv->need_second_field;
priv->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | priv->pic->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE; FF_BUFFER_HINTS_REUSABLE;
if (!priv->pic.data[0]) { if (!priv->pic->data[0]) {
if (ff_get_buffer(avctx, &priv->pic, 0) < 0) { if (ff_get_buffer(avctx, priv->pic, AV_GET_BUFFER_FLAG_REF) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return RET_ERROR; return RET_ERROR;
} }
@ -663,8 +662,8 @@ static inline CopyRet copy_frame(AVCodecContext *avctx,
sStride = bwidth; sStride = bwidth;
} }
dStride = priv->pic.linesize[0]; dStride = priv->pic->linesize[0];
dst = priv->pic.data[0]; dst = priv->pic->data[0];
av_log(priv->avctx, AV_LOG_VERBOSE, "CrystalHD: Copying out frame\n"); av_log(priv->avctx, AV_LOG_VERBOSE, "CrystalHD: Copying out frame\n");
@ -689,15 +688,17 @@ static inline CopyRet copy_frame(AVCodecContext *avctx,
av_image_copy_plane(dst, dStride, src, sStride, bwidth, height); av_image_copy_plane(dst, dStride, src, sStride, bwidth, height);
} }
priv->pic.interlaced_frame = interlaced; priv->pic->interlaced_frame = interlaced;
if (interlaced) if (interlaced)
priv->pic.top_field_first = !bottom_first; priv->pic->top_field_first = !bottom_first;
priv->pic.pkt_pts = pkt_pts; priv->pic->pkt_pts = pkt_pts;
if (!priv->need_second_field) { if (!priv->need_second_field) {
*got_frame = 1; *got_frame = 1;
*(AVFrame *)data = priv->pic; if ((ret = av_frame_ref(data, priv->pic)) < 0) {
return ret;
}
} }
/* /*