virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

all: Use av_frame_replace() where appropriate

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-07 12:02:26 +02:00
parent 0487786ffe
commit cfa47fd331
31 changed files with 34 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/agm.c
View File

@ -1203,8 +1203,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
if (ret < 0) if (ret < 0)
return ret; return ret;
av_frame_unref(s->prev_frame); if ((ret = av_frame_replace(s->prev_frame, frame)) < 0)
if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
return ret; return ret;
frame->crop_top = avctx->coded_height - avctx->height; frame->crop_top = avctx->coded_height - avctx->height;

3
libavcodec/arbc.c
View File

@ -166,8 +166,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
prev_pixels -= fill_tile4(avctx, fill, frame); prev_pixels -= fill_tile4(avctx, fill, frame);
} }
av_frame_unref(s->prev_frame); if ((ret = av_frame_replace(s->prev_frame, frame)) < 0)
if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
return ret; return ret;
frame->pict_type = prev_pixels <= 0 ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; frame->pict_type = prev_pixels <= 0 ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;

3
libavcodec/audiotoolboxenc.c
View File

@ -483,8 +483,7 @@ static OSStatus ffat_encode_callback(AudioConverterRef converter, UInt32 *nb_pac
if (*nb_packets > frame->nb_samples) if (*nb_packets > frame->nb_samples)
*nb_packets = frame->nb_samples; *nb_packets = frame->nb_samples;
av_frame_unref(at->encoding_frame); ret = av_frame_replace(at->encoding_frame, frame);
ret = av_frame_ref(at->encoding_frame, frame);
if (ret < 0) { if (ret < 0) {
*nb_packets = 0; *nb_packets = 0;
return ret; return ret;

3
libavcodec/bink.c
View File

@ -1300,8 +1300,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
emms_c(); emms_c();
if (c->version > 'b') { if (c->version > 'b') {
av_frame_unref(c->last); if ((ret = av_frame_replace(c->last, frame)) < 0)
if ((ret = av_frame_ref(c->last, frame)) < 0)
return ret; return ret;
} }

3
libavcodec/cdgraphics.c
View File

@ -344,8 +344,7 @@ static int cdg_decode_frame(AVCodecContext *avctx, AVFrame *frame,
return ret; return ret;
cdg_scroll(cc, cdg_data, frame, inst == CDG_INST_SCROLL_COPY); cdg_scroll(cc, cdg_data, frame, inst == CDG_INST_SCROLL_COPY);
av_frame_unref(cc->frame); ret = av_frame_replace(cc->frame, frame);
ret = av_frame_ref(cc->frame, frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
break; break;

3
libavcodec/dxa.c
View File

@ -317,8 +317,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
av_frame_unref(c->prev); if ((ret = av_frame_replace(c->prev, frame)) < 0)
if ((ret = av_frame_ref(c->prev, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;

5
libavcodec/eacmv.c
View File

@ -210,9 +210,8 @@ static int cmv_decode_frame(AVCodecContext *avctx, AVFrame *frame,
cmv_decode_intra(s, frame, buf+2, buf_end); cmv_decode_intra(s, frame, buf+2, buf_end);
} }
av_frame_unref(s->last2_frame); FFSWAP(AVFrame*, s->last2_frame, s->last_frame);
av_frame_move_ref(s->last2_frame, s->last_frame); if ((ret = av_frame_replace(s->last_frame, frame)) < 0)
if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;

3
libavcodec/eamad.c
View File

@ -317,8 +317,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
*got_frame = 1; *got_frame = 1;
if (chunk_type != MADe_TAG) { if (chunk_type != MADe_TAG) {
av_frame_unref(s->last_frame); if ((ret = av_frame_replace(s->last_frame, frame)) < 0)
if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
return ret; return ret;
} }

3
libavcodec/eatgv.c
View File

@ -338,8 +338,7 @@ static int tgv_decode_frame(AVCodecContext *avctx, AVFrame *frame,
} }
} }
av_frame_unref(s->last_frame); if ((ret = av_frame_replace(s->last_frame, frame)) < 0)
if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;

3
libavcodec/escape124.c
View File

@ -362,8 +362,7 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame,
"Escape sizes: %i, %i, %i\n", "Escape sizes: %i, %i, %i\n",
frame_size, buf_size, get_bits_count(&gb) / 8); frame_size, buf_size, get_bits_count(&gb) / 8);
av_frame_unref(s->frame); if ((ret = av_frame_replace(s->frame, frame)) < 0)
if ((ret = av_frame_ref(s->frame, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;

3
libavcodec/gif.c
View File

@ -503,8 +503,7 @@ static int gif_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
} }
if (!s->image) { if (!s->image) {
av_frame_unref(s->last_frame); ret = av_frame_replace(s->last_frame, pict);
ret = av_frame_ref(s->last_frame, pict);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }

3
libavcodec/imm4.c
View File

@ -453,8 +453,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
if (ret < 0) if (ret < 0)
return ret; return ret;
av_frame_unref(s->prev_frame); if ((ret = av_frame_replace(s->prev_frame, frame)) < 0)
if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
return ret; return ret;
} else { } else {
if (!s->prev_frame->data[0]) { if (!s->prev_frame->data[0]) {

3
libavcodec/interplayvideo.c
View File

@ -1340,9 +1340,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
*got_frame = send_buffer; *got_frame = send_buffer;
/* shuffle frames */ /* shuffle frames */
av_frame_unref(s->second_last_frame);
FFSWAP(AVFrame*, s->second_last_frame, s->last_frame); FFSWAP(AVFrame*, s->second_last_frame, s->last_frame);
if ((ret = av_frame_ref(s->last_frame, frame)) < 0) if ((ret = av_frame_replace(s->last_frame, frame)) < 0)
return ret; return ret;
/* report that the buffer was completely consumed */ /* report that the buffer was completely consumed */

3
libavcodec/mss2.c
View File

@ -797,8 +797,7 @@ static int mss2_decode_frame(AVCodecContext *avctx, AVFrame *frame,
av_log(avctx, AV_LOG_WARNING, "buffer not fully consumed\n"); av_log(avctx, AV_LOG_WARNING, "buffer not fully consumed\n");
if (c->mvX < 0 || c->mvY < 0) { if (c->mvX < 0 || c->mvY < 0) {
av_frame_unref(ctx->last_pic); ret = av_frame_replace(ctx->last_pic, frame);
ret = av_frame_ref(ctx->last_pic, frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }

3
libavcodec/mv30.c
View File

@ -643,8 +643,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
return ret; return ret;
} }
av_frame_unref(s->prev_frame); if ((ret = av_frame_replace(s->prev_frame, frame)) < 0)
if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;

3
libavcodec/mwsc.c
View File

@ -127,8 +127,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
frame->pict_type = (frame->flags & AV_FRAME_FLAG_KEY) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; frame->pict_type = (frame->flags & AV_FRAME_FLAG_KEY) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
av_frame_unref(s->prev_frame); if ((ret = av_frame_replace(s->prev_frame, frame)) < 0)
if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;

3
libavcodec/pdvdec.c
View File

@ -102,8 +102,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
dst += frame->linesize[0]; dst += frame->linesize[0];
} }
av_frame_unref(s->previous_frame); if ((ret = av_frame_replace(s->previous_frame, frame)) < 0)
if ((ret = av_frame_ref(s->previous_frame, frame)) < 0)
return ret; return ret;
if (avpkt->flags & AV_PKT_FLAG_KEY) { if (avpkt->flags & AV_PKT_FLAG_KEY) {

3
libavcodec/pngenc.c
View File

@ -1059,8 +1059,7 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt,
} }
} }
av_frame_unref(s->last_frame); ret = av_frame_replace(s->last_frame, pict);
ret = av_frame_ref(s->last_frame, pict);
if (ret < 0) if (ret < 0)
return ret; return ret;

3
libavcodec/qpeg.c
View File

@ -307,8 +307,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
memcpy(p->data[1], a->pal, AVPALETTE_SIZE); memcpy(p->data[1], a->pal, AVPALETTE_SIZE);
av_frame_unref(ref); if ((ret = av_frame_replace(ref, p)) < 0)
if ((ret = av_frame_ref(ref, p)) < 0)
return ret; return ret;
if (intra) if (intra)

3
libavcodec/qsvenc.c
View File

@ -1996,8 +1996,7 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame,
return ret; return ret;
} }
} else { } else {
av_frame_unref(qf->frame); ret = av_frame_replace(qf->frame, frame);
ret = av_frame_ref(qf->frame, frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }

3
libavcodec/qtrleenc.c
View File

@ -385,8 +385,7 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
pkt->size = encode_frame(s, pict, pkt->data); pkt->size = encode_frame(s, pict, pkt->data);
/* save the current frame */ /* save the current frame */
av_frame_unref(s->previous_frame); ret = av_frame_replace(s->previous_frame, pict);
ret = av_frame_ref(s->previous_frame, pict);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "cannot add reference\n"); av_log(avctx, AV_LOG_ERROR, "cannot add reference\n");
return ret; return ret;

3
libavcodec/smcenc.c
View File

@ -566,8 +566,7 @@ static int smc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
// write chunk length // write chunk length
AV_WB24(pkt->data + 1, pkt->size); AV_WB24(pkt->data + 1, pkt->size);
av_frame_unref(s->prev_frame); ret = av_frame_replace(s->prev_frame, frame);
ret = av_frame_ref(s->prev_frame, frame);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "cannot add reference\n"); av_log(avctx, AV_LOG_ERROR, "cannot add reference\n");
return ret; return ret;

3
libavcodec/snowenc.c
View File

@ -1887,8 +1887,7 @@ redo_frame:
(s->avctx->flags&AV_CODEC_FLAG_PSNR) ? SNOW_MAX_PLANES : 0, (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? SNOW_MAX_PLANES : 0,
s->current_picture->pict_type); s->current_picture->pict_type);
if (s->avctx->flags & AV_CODEC_FLAG_RECON_FRAME) { if (s->avctx->flags & AV_CODEC_FLAG_RECON_FRAME) {
av_frame_unref(avci->recon_frame); av_frame_replace(avci->recon_frame, s->current_picture);
av_frame_ref(avci->recon_frame, s->current_picture);
} }
pkt->size = ff_rac_terminate(c, 0); pkt->size = ff_rac_terminate(c, 0);

3
libavcodec/svq1dec.c
View File

@ -764,8 +764,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, AVFrame *cur,
} }
if (!s->nonref) { if (!s->nonref) {
av_frame_unref(s->prev); result = av_frame_replace(s->prev, cur);
result = av_frame_ref(s->prev, cur);
if (result < 0) if (result < 0)
return result; return result;
} }

3
libavcodec/vmdvideo.c
View File

@ -454,8 +454,7 @@ static int vmdvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame,
memcpy(frame->data[1], s->palette, PALETTE_COUNT * 4); memcpy(frame->data[1], s->palette, PALETTE_COUNT * 4);
/* shuffle frames */ /* shuffle frames */
av_frame_unref(s->prev_frame); if ((ret = av_frame_replace(s->prev_frame, frame)) < 0)
if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;

6
libavcodec/vp56.c
View File

@ -607,8 +607,7 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
} }
if (avctx->pix_fmt == AV_PIX_FMT_YUVA420P) { if (avctx->pix_fmt == AV_PIX_FMT_YUVA420P) {
av_frame_unref(s->alpha_context->frames[VP56_FRAME_CURRENT]); if ((ret = av_frame_replace(s->alpha_context->frames[VP56_FRAME_CURRENT], p)) < 0) {
if ((ret = av_frame_ref(s->alpha_context->frames[VP56_FRAME_CURRENT], p)) < 0) {
av_frame_unref(p); av_frame_unref(p);
if (res == VP56_SIZE_CHANGE) if (res == VP56_SIZE_CHANGE)
ff_set_dimensions(avctx, 0, 0); ff_set_dimensions(avctx, 0, 0);
@ -764,8 +763,7 @@ static int ff_vp56_decode_mbs(AVCodecContext *avctx, void *data,
next: next:
if ((p->flags & AV_FRAME_FLAG_KEY) || s->golden_frame) { if ((p->flags & AV_FRAME_FLAG_KEY) || s->golden_frame) {
av_frame_unref(s->frames[VP56_FRAME_GOLDEN]); if ((res = av_frame_replace(s->frames[VP56_FRAME_GOLDEN], p)) < 0)
if ((res = av_frame_ref(s->frames[VP56_FRAME_GOLDEN], p)) < 0)
return res; return res;
} }

3
libavcodec/xan.c
View File

@ -622,8 +622,7 @@ static int xan_decode_frame(AVCodecContext *avctx, AVFrame *frame,
if (xan_wc3_decode_frame(s, frame) < 0) if (xan_wc3_decode_frame(s, frame) < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_frame_unref(s->last_frame); if ((ret = av_frame_replace(s->last_frame, frame)) < 0)
if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;

3
libavcodec/zerocodec.c
View File

@ -93,8 +93,7 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, AVFrame *pic,
dst -= pic->linesize[0]; dst -= pic->linesize[0];
} }
av_frame_unref(zc->previous_frame); if ((ret = av_frame_replace(zc->previous_frame, pic)) < 0)
if ((ret = av_frame_ref(zc->previous_frame, pic)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;

3
libavfilter/vf_paletteuse.c
View File

@ -781,9 +781,8 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf)
set_processing_window(s->diff_mode, s->last_in, in, set_processing_window(s->diff_mode, s->last_in, in,
s->last_out, out, &x, &y, &w, &h); s->last_out, out, &x, &y, &w, &h);
av_frame_unref(s->last_in);
av_frame_unref(s->last_out); av_frame_unref(s->last_out);
if ((ret = av_frame_ref(s->last_in, in)) < 0 || if ((ret = av_frame_replace(s->last_in, in)) < 0 ||
(ret = av_frame_ref(s->last_out, out)) < 0 || (ret = av_frame_ref(s->last_out, out)) < 0 ||
(ret = ff_inlink_make_frame_writable(inlink, &s->last_in)) < 0) { (ret = ff_inlink_make_frame_writable(inlink, &s->last_in)) < 0) {
av_frame_free(&out); av_frame_free(&out);

3
libavfilter/vsrc_ddagrab.c
View File

@ -1076,8 +1076,7 @@ static int ddagrab_request_frame(AVFilterLink *outlink)
goto fail; goto fail;
} }
av_frame_unref(dda->last_frame); ret = av_frame_replace(dda->last_frame, frame);
ret = av_frame_ref(dda->last_frame, frame);
if (ret < 0) if (ret < 0)
return ret; return ret;

6
libavutil/hwcontext.c
View File

@ -819,8 +819,7 @@ int av_hwframe_map(AVFrame *dst, const AVFrame *src, int flags)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
hwmap = (HWMapDescriptor*)src->buf[0]->data; hwmap = (HWMapDescriptor*)src->buf[0]->data;
av_frame_unref(dst); return av_frame_replace(dst, hwmap->source);
return av_frame_ref(dst, hwmap->source);
} }
} }
@ -950,6 +949,5 @@ fail:
int ff_hwframe_map_replace(AVFrame *dst, const AVFrame *src) int ff_hwframe_map_replace(AVFrame *dst, const AVFrame *src)
{ {
HWMapDescriptor *hwmap = (HWMapDescriptor*)dst->buf[0]->data; HWMapDescriptor *hwmap = (HWMapDescriptor*)dst->buf[0]->data;
av_frame_unref(hwmap->source); return av_frame_replace(hwmap->source, src);
return av_frame_ref(hwmap->source, src);
} }