har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/src_movie: stop using AV_CODEC_FLAG_COPY_OPAQUE

Browse Source 
That feature is overkill for a constant pointer to AVFilterLink which
can be stored in AVCodecContext.opaque (indirectly, because the link is
not allocated yet at the time the codec is opened).

This also avoids leaking non-NULL AVFrame.opaque to callers.
This commit is contained in:
Anton Khirnov 2023-07-09 11:25:55 +02:00
parent 75b1a555a7
commit bbff143b07
1 changed files with 6 additions and 4 deletions

10
libavfilter/src_movie.c

@ -51,6 +51,7 @@
#include "video.h" #include "video.h"
typedef struct MovieStream { typedef struct MovieStream {
AVFilterLink *link;
AVStream *st; AVStream *st;
AVCodecContext *codec_ctx; AVCodecContext *codec_ctx;
int64_t discontinuity_threshold; int64_t discontinuity_threshold;
@ -162,7 +163,8 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec)
static int get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) static int get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
{ {
int linesize_align[AV_NUM_DATA_POINTERS]; int linesize_align[AV_NUM_DATA_POINTERS];
AVFilterLink *outlink = frame->opaque; MovieStream *st = avctx->opaque;
AVFilterLink *outlink = st->link;
int w, h, ow, oh, copy = 0; int w, h, ow, oh, copy = 0;
AVFrame *new; AVFrame *new;
@ -202,7 +204,6 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
av_frame_move_ref(frame, new); av_frame_move_ref(frame, new);
av_frame_free(&new); av_frame_free(&new);
frame->opaque = outlink;
frame->width = ow; frame->width = ow;
frame->height = oh; frame->height = oh;
@ -224,7 +225,7 @@ static int open_stream(AVFilterContext *ctx, MovieStream *st, int dec_threads)
if (!st->codec_ctx) if (!st->codec_ctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codec_ctx->flags |= AV_CODEC_FLAG_COPY_OPAQUE; st->codec_ctx->opaque = st;
st->codec_ctx->get_buffer2 = get_buffer; st->codec_ctx->get_buffer2 = get_buffer;
ret = avcodec_parameters_to_context(st->codec_ctx, st->st->codecpar); ret = avcodec_parameters_to_context(st->codec_ctx, st->st->codecpar);
if (ret < 0) if (ret < 0)
@ -469,6 +470,8 @@ static int movie_config_output_props(AVFilterLink *outlink)
break; break;
} }
st->link = outlink;
return 0; return 0;
} }
@ -581,7 +584,6 @@ static int activate(AVFilterContext *ctx)
movie->out_index[movie->pkt->stream_index]; movie->out_index[movie->pkt->stream_index];
if (pkt_out_id >= 0) { if (pkt_out_id >= 0) {
movie->pkt->opaque = ctx->outputs[pkt_out_id];
ret = decode_packet(ctx, pkt_out_id); ret = decode_packet(ctx, pkt_out_id);
} }
av_packet_unref(movie->pkt); av_packet_unref(movie->pkt);