virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

lavfi/vf_libplacebo: use correct link in update_crops()

Browse Source 
Instead of hard-coding input 0, pass the per-input structure and use the
link contained inside it.
This commit is contained in:
Niklas Haas 2023-06-15 15:47:55 +02:00
parent 93c7e8c0ae
commit a7775bd32c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/vf_libplacebo.c
View File

@ -715,19 +715,18 @@ static const AVFrame *ref_frame(const struct pl_frame_mix *mix)
return NULL; return NULL;
} }
static void update_crops(AVFilterContext *ctx, static void update_crops(AVFilterContext *ctx, LibplaceboInput *in,
struct pl_frame_mix *mix, struct pl_frame *target, struct pl_frame *target, double target_pts)
double target_pts)
{ {
LibplaceboContext *s = ctx->priv; LibplaceboContext *s = ctx->priv;
const AVFrame *ref = ref_frame(mix); const AVFrame *ref = ref_frame(&in->mix);
for (int i = 0; i < mix->num_frames; i++) { for (int i = 0; i < in->mix.num_frames; i++) {
// Mutate the `pl_frame.crop` fields in-place. This is fine because we // Mutate the `pl_frame.crop` fields in-place. This is fine because we
// own the entire pl_queue, and hence, the pointed-at frames. // own the entire pl_queue, and hence, the pointed-at frames.
struct pl_frame *image = (struct pl_frame *) mix->frames[i]; struct pl_frame *image = (struct pl_frame *) in->mix.frames[i];
const AVFrame *src = pl_get_mapped_avframe(image); const AVFrame *src = pl_get_mapped_avframe(image);
double image_pts = src->pts * av_q2d(ctx->inputs[0]->time_base); double image_pts = src->pts * av_q2d(in->link->time_base);
/* Update dynamic variables */ /* Update dynamic variables */
s->var_values[VAR_IN_T] = s->var_values[VAR_T] = image_pts; s->var_values[VAR_IN_T] = s->var_values[VAR_T] = image_pts;
@ -851,7 +850,7 @@ static int output_frame(AVFilterContext *ctx, int64_t pts)
goto fail; goto fail;
} }
update_crops(ctx, &in->mix, &target, out->pts * av_q2d(outlink->time_base)); update_crops(ctx, in, &target, out->pts * av_q2d(outlink->time_base));
pl_render_image_mix(in->renderer, &in->mix, &target, &s->params); pl_render_image_mix(in->renderer, &in->mix, &target, &s->params);
if (outdesc->flags & AV_PIX_FMT_FLAG_HWACCEL) { if (outdesc->flags & AV_PIX_FMT_FLAG_HWACCEL) {