mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
vdpauvideopostprocess: set new framerate on output caps instead of input caps
It's not allowed to change the caps provided by the setcaps function. https://bugzilla.gnome.org/show_bug.cgi?id=628326
This commit is contained in:
parent
7e8580c955
commit
b2ce3aab96
1 changed files with 15 additions and 15 deletions
|
@ -501,7 +501,6 @@ gst_vdp_vpp_sink_setcaps (GstPad * pad, GstCaps * caps)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
structure = gst_caps_get_structure (video_caps, 0);
|
structure = gst_caps_get_structure (video_caps, 0);
|
||||||
if (!gst_structure_get_int (structure, "width", &vpp->width) ||
|
if (!gst_structure_get_int (structure, "width", &vpp->width) ||
|
||||||
!gst_structure_get_int (structure, "height", &vpp->height) ||
|
!gst_structure_get_int (structure, "height", &vpp->height) ||
|
||||||
|
@ -522,19 +521,6 @@ gst_vdp_vpp_sink_setcaps (GstPad * pad, GstCaps * caps)
|
||||||
} else
|
} else
|
||||||
vpp->got_par = FALSE;
|
vpp->got_par = FALSE;
|
||||||
|
|
||||||
if (gst_vdp_vpp_is_interlaced (vpp)) {
|
|
||||||
gint fps_n, fps_d;
|
|
||||||
|
|
||||||
if (gst_structure_get_fraction (structure, "framerate", &fps_n, &fps_d)) {
|
|
||||||
gst_fraction_double (&fps_n, &fps_d);
|
|
||||||
gst_structure_set (structure, "framerate", GST_TYPE_FRACTION, fps_n,
|
|
||||||
fps_d, NULL);
|
|
||||||
vpp->field_duration = gst_util_uint64_scale (GST_SECOND, fps_d, fps_n);
|
|
||||||
}
|
|
||||||
|
|
||||||
gst_structure_remove_field (structure, "interlaced");
|
|
||||||
}
|
|
||||||
|
|
||||||
allowed_caps = gst_pad_get_allowed_caps (vpp->srcpad);
|
allowed_caps = gst_pad_get_allowed_caps (vpp->srcpad);
|
||||||
if (G_UNLIKELY (!allowed_caps))
|
if (G_UNLIKELY (!allowed_caps))
|
||||||
goto allowed_caps_error;
|
goto allowed_caps_error;
|
||||||
|
@ -554,6 +540,20 @@ gst_vdp_vpp_sink_setcaps (GstPad * pad, GstCaps * caps)
|
||||||
|
|
||||||
gst_pad_fixate_caps (vpp->srcpad, src_caps);
|
gst_pad_fixate_caps (vpp->srcpad, src_caps);
|
||||||
|
|
||||||
|
|
||||||
|
if (gst_vdp_vpp_is_interlaced (vpp)) {
|
||||||
|
gint fps_n, fps_d;
|
||||||
|
|
||||||
|
if (gst_structure_get_fraction (structure, "framerate", &fps_n, &fps_d)) {
|
||||||
|
gst_fraction_double (&fps_n, &fps_d);
|
||||||
|
gst_caps_set_simple (src_caps, "framerate", GST_TYPE_FRACTION, fps_n,
|
||||||
|
fps_d, NULL);
|
||||||
|
vpp->field_duration = gst_util_uint64_scale (GST_SECOND, fps_d, fps_n);
|
||||||
|
}
|
||||||
|
|
||||||
|
gst_caps_set_simple (src_caps, "interlaced", G_TYPE_BOOLEAN, FALSE, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
GST_DEBUG ("src_caps: %" GST_PTR_FORMAT, src_caps);
|
GST_DEBUG ("src_caps: %" GST_PTR_FORMAT, src_caps);
|
||||||
|
|
||||||
res = gst_pad_set_caps (vpp->srcpad, src_caps);
|
res = gst_pad_set_caps (vpp->srcpad, src_caps);
|
||||||
|
|
Loading…
Reference in a new issue