History

avfilter/vf_interlace_vulkan: fix FPS and PTS calculation

ol->frame_rate is 0/0, so we need to calcalute the correct value based on the il->frame_rate instead. Also adjust the time base, PTS and frame_duration values accordingly. (Logic taken from vf_tinterlace.c)

Niklas Haas committed 1 year ago

Commit 4099d531 parent f1b3e511 file · +9 −1Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_interlace_vulkan.c+9−1
@@ -189,7 +189,9 @@ static int interlace_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) · 188 unmodified lines
189 AVFrame *out = NULL, *input_top, *input_bot;189 AVFrame *out = NULL, *input_top, *input_bot;
190 AVFilterContext *ctx = link->dst;190 AVFilterContext *ctx = link->dst;
191 InterlaceVulkanContext *s = ctx->priv;191 InterlaceVulkanContext *s = ctx->priv;
192 const AVFilterLink *inlink = ctx->inputs[0];
192 AVFilterLink *outlink = ctx->outputs[0];193 AVFilterLink *outlink = ctx->outputs[0];
194 FilterLink *l = ff_filter_link(outlink);
193 195
194 if (!s->initialized)196 if (!s->initialized)
195 RET(init_filter(ctx));197 RET(init_filter(ctx));
@@ -226,6 +228,9 @@ static int interlace_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) · 30 unmodified lines
226 if (s->mode == MODE_TFF)228 if (s->mode == MODE_TFF)
227 out->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;229 out->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
228 230
231 out->pts = av_rescale_q(out->pts, inlink->time_base, outlink->time_base);
232 out->duration = av_rescale_q(1, av_inv_q(l->frame_rate), outlink->time_base);
233
229 av_frame_free(&s->cur);234 av_frame_free(&s->cur);
230 av_frame_free(&in);235 av_frame_free(&in);
231 236
@@ -260,9 +265,12 @@ static void interlace_vulkan_uninit(AVFilterContext *avctx) · 28 unmodified lines
260 265
261static int config_out_props(AVFilterLink *outlink)266static int config_out_props(AVFilterLink *outlink)
262{267{
268 AVFilterLink *inlink = outlink->src->inputs[0];
269 const FilterLink *il = ff_filter_link(inlink);
263 FilterLink *ol = ff_filter_link(outlink);270 FilterLink *ol = ff_filter_link(outlink);
264 271
265 ol->frame_rate = av_mul_q(ol->frame_rate, av_make_q(1, 2));272 ol->frame_rate = av_mul_q(il->frame_rate, av_make_q(1, 2));
273 outlink->time_base = av_mul_q(inlink->time_base, av_make_q(2, 1));
266 return ff_vk_filter_config_output(outlink);274 return ff_vk_filter_config_output(outlink);
267}275}
268 276

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t