mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

videorate: fix caps negotiation function

Browse source
This commit is contained in:
Wim Taymans 2012-01-02 17:28:12 +01:00
parent 2f3cf3a7ee
commit f4e58e3e8e
1 changed files with 76 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gst/videorate/gstvideorate.c
View file

@ -365,16 +365,16 @@ gst_video_rate_transform_caps (GstBaseTransform * trans,
{ {
GstVideoRate *videorate = GST_VIDEO_RATE (trans); GstVideoRate *videorate = GST_VIDEO_RATE (trans);
GstCaps *ret; GstCaps *ret;
GstStructure *s, *s2; GstStructure *s, *s1, *s2, *s3 = NULL;
GstStructure *s3 = NULL;
int maxrate = g_atomic_int_get (&videorate->max_rate); int maxrate = g_atomic_int_get (&videorate->max_rate);
gint i;
/* Should always be called with simple caps */ ret = gst_caps_new_empty ();
g_return_val_if_fail (GST_CAPS_IS_SIMPLE (caps), NULL);
ret = gst_caps_copy (caps); for (i = 0; i < gst_caps_get_size (caps); i++) {
s = gst_caps_get_structure (caps, i);
s = gst_caps_get_structure (ret, 0); s1 = gst_structure_copy (s);
s2 = gst_structure_copy (s); s2 = gst_structure_copy (s);
if (videorate->drop_only) { if (videorate->drop_only) {
@ -382,7 +382,7 @@ gst_video_rate_transform_caps (GstBaseTransform * trans,
gint max_num = G_MAXINT, max_denom = 1; gint max_num = G_MAXINT, max_denom = 1;
/* Clamp the caps to our maximum rate as the first caps if possible */ /* Clamp the caps to our maximum rate as the first caps if possible */
if (!gst_video_max_rate_clamp_structure (s, maxrate, if (!gst_video_max_rate_clamp_structure (s1, maxrate,
&min_num, &min_denom, &max_num, &max_denom)) { &min_num, &min_denom, &max_num, &max_denom)) {
min_num = 0; min_num = 0;
min_denom = 1; min_denom = 1;
@ -397,10 +397,12 @@ gst_video_rate_transform_caps (GstBaseTransform * trans,
* In case [X..maxrate] == [X..maxint], skip as we'll set it later * In case [X..maxrate] == [X..maxint], skip as we'll set it later
*/ */
if (direction == GST_PAD_SRC && maxrate != G_MAXINT) if (direction == GST_PAD_SRC && maxrate != G_MAXINT)
gst_structure_set (s, "framerate", GST_TYPE_FRACTION_RANGE, gst_structure_set (s1, "framerate", GST_TYPE_FRACTION_RANGE,
min_num, min_denom, maxrate, 1, NULL); min_num, min_denom, maxrate, 1, NULL);
else else {
gst_caps_remove_structure (ret, 0); gst_structure_free (s1);
s1 = NULL;
}
} }
if (direction == GST_PAD_SRC) { if (direction == GST_PAD_SRC) {
@ -423,10 +425,11 @@ gst_video_rate_transform_caps (GstBaseTransform * trans,
gint min_num = 0, min_denom = 1; gint min_num = 0, min_denom = 1;
gint max_num = G_MAXINT, max_denom = 1; gint max_num = G_MAXINT, max_denom = 1;
if (!gst_video_max_rate_clamp_structure (s, maxrate, if (!gst_video_max_rate_clamp_structure (s1, maxrate,
&min_num, &min_denom, &max_num, &max_denom)) &min_num, &min_denom, &max_num, &max_denom)) {
gst_caps_remove_structure (ret, 0); gst_structure_free (s1);
s1 = NULL;
}
gst_structure_set (s2, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, gst_structure_set (s2, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
maxrate, 1, NULL); maxrate, 1, NULL);
} else { } else {
@ -434,11 +437,20 @@ gst_video_rate_transform_caps (GstBaseTransform * trans,
gst_structure_set (s2, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, gst_structure_set (s2, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
G_MAXINT, 1, NULL); G_MAXINT, 1, NULL);
} }
if (s1 != NULL)
gst_caps_merge_structure (ret, s1);
gst_caps_merge_structure (ret, s2); gst_caps_merge_structure (ret, s2);
if (s3 != NULL) if (s3 != NULL)
gst_caps_merge_structure (ret, s3); gst_caps_merge_structure (ret, s3);
}
if (filter) {
GstCaps *intersection;
intersection =
gst_caps_intersect_full (filter, ret, GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (ret);
ret = intersection;
}
return ret; return ret;
} }
@ -453,6 +465,7 @@ gst_video_rate_fixate_caps (GstBaseTransform * trans,
if (G_UNLIKELY (!gst_structure_get_fraction (s, "framerate", &num, &denom))) if (G_UNLIKELY (!gst_structure_get_fraction (s, "framerate", &num, &denom)))
return; return;
gst_caps_truncate (othercaps);
s = gst_caps_get_structure (othercaps, 0); s = gst_caps_get_structure (othercaps, 0);
gst_structure_fixate_field_nearest_fraction (s, "framerate", num, denom); gst_structure_fixate_field_nearest_fraction (s, "framerate", num, denom);
} }