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

lavfi/vf_libplacebo: move temporary vars into per-input struct

Browse Source 
Including the queue status, because these will need to be re-queried
inside output_frame_mix when that function is refactored to handle
multiple inputs.
This commit is contained in:
Niklas Haas 2023-06-15 15:32:39 +02:00
parent a4197196a0
commit ad445a7030
1 changed files with 5 additions and 6 deletions

11
libavfilter/vf_libplacebo.c

@ -117,6 +117,8 @@ enum var_name {
typedef struct LibplaceboInput { typedef struct LibplaceboInput {
pl_renderer renderer; pl_renderer renderer;
pl_queue queue; pl_queue queue;
enum pl_queue_status qstatus;
struct pl_frame_mix mix; ///< temporary storage
AVFilterLink *link; AVFilterLink *link;
AVFifo *out_pts; ///< timestamps of wanted output frames AVFifo *out_pts; ///< timestamps of wanted output frames
int64_t status_pts; int64_t status_pts;
@ -952,9 +954,6 @@ static int libplacebo_activate(AVFilterContext *ctx)
return ret; return ret;
if (ff_outlink_frame_wanted(outlink)) { if (ff_outlink_frame_wanted(outlink)) {
struct pl_frame_mix mix;
enum pl_queue_status ret;
if (s->fps.num) { if (s->fps.num) {
pts = outlink->frame_count_out; pts = outlink->frame_count_out;
} else if (av_fifo_peek(in->out_pts, &pts, 1, 0) < 0) { } else if (av_fifo_peek(in->out_pts, &pts, 1, 0) < 0) {
@ -972,20 +971,20 @@ static int libplacebo_activate(AVFilterContext *ctx)
return 0; return 0;
} }
ret = pl_queue_update(in->queue, &mix, pl_queue_params( in->qstatus = pl_queue_update(in->queue, &in->mix, pl_queue_params(
.pts = pts * av_q2d(outlink->time_base), .pts = pts * av_q2d(outlink->time_base),
.radius = pl_frame_mix_radius(&s->params), .radius = pl_frame_mix_radius(&s->params),
.vsync_duration = av_q2d(av_inv_q(outlink->frame_rate)), .vsync_duration = av_q2d(av_inv_q(outlink->frame_rate)),
)); ));
switch (ret) { switch (in->qstatus) {
case PL_QUEUE_MORE: case PL_QUEUE_MORE:
ff_inlink_request_frame(in->link); ff_inlink_request_frame(in->link);
return 0; return 0;
case PL_QUEUE_OK: case PL_QUEUE_OK:
if (!s->fps.num) if (!s->fps.num)
av_fifo_drain2(in->out_pts, 1); av_fifo_drain2(in->out_pts, 1);
return output_frame_mix(ctx, &mix, pts); return output_frame_mix(ctx, &in->mix, pts);
case PL_QUEUE_ERR: case PL_QUEUE_ERR:
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} }