mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-27 00:16:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: repect the result of find_best_format in the default update_caps

Browse source 
We weren't using the result of find_best_format at all.

Also, move the find_best_format usage to the default update_caps() to make
sure that it is also overridable.

https://bugzilla.gnome.org/show_bug.cgi?id=764363
This commit is contained in:
Matthew Waters 2016-04-04 20:55:51 +10:00
parent f2c2717ac7
commit 92245ec05f
2 changed files with 69 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/gl/gstglvideomixer.c
View file

@ -977,14 +977,10 @@ _update_caps (GstVideoAggregator * vagg, GstCaps * caps, GstCaps * filter)
{ {
GstCaps *ret; GstCaps *ret;
ret =
GST_VIDEO_AGGREGATOR_CLASS (gst_gl_video_mixer_parent_class)->update_caps
(vagg, caps, NULL);
if (filter) { if (filter) {
GstCaps *tmp = gst_caps_intersect (ret, filter); ret = gst_caps_intersect (caps, filter);
gst_caps_unref (ret); } else {
ret = tmp; ret = gst_caps_ref (caps);
} }
return ret; return ret;

101
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -647,12 +647,42 @@ static GstCaps *
gst_videoaggregator_default_update_caps (GstVideoAggregator * vagg, gst_videoaggregator_default_update_caps (GstVideoAggregator * vagg,
GstCaps * caps, GstCaps * filter) GstCaps * caps, GstCaps * filter)
{ {
GstCaps *ret; GstVideoAggregatorClass *vagg_klass = GST_VIDEO_AGGREGATOR_GET_CLASS (vagg);
GstCaps *ret, *best_format_caps;
gboolean at_least_one_alpha = FALSE;
GstVideoFormat best_format;
GstVideoInfo best_info;
best_format = GST_VIDEO_FORMAT_UNKNOWN;
gst_video_info_init (&best_info);
if (vagg_klass->find_best_format) {
vagg_klass->find_best_format (vagg, caps, &best_info, &at_least_one_alpha);
best_format = GST_VIDEO_INFO_FORMAT (&best_info);
}
if (best_format == GST_VIDEO_FORMAT_UNKNOWN) {
GstCaps *tmp = gst_caps_fixate (gst_caps_ref (caps));
gst_video_info_from_caps (&best_info, tmp);
best_format = GST_VIDEO_INFO_FORMAT (&best_info);
gst_caps_unref (tmp);
}
GST_DEBUG_OBJECT (vagg,
"The output format will now be : %d with chroma : %s",
best_format, gst_video_chroma_to_string (best_info.chroma_site));
best_format_caps = gst_caps_copy (caps);
gst_caps_set_simple (best_format_caps, "format", G_TYPE_STRING,
gst_video_format_to_string (best_format), "chroma-site", G_TYPE_STRING,
gst_video_chroma_to_string (best_info.chroma_site), NULL);
ret = gst_caps_merge (best_format_caps, gst_caps_ref (caps));
if (filter) { if (filter) {
ret = gst_caps_intersect (caps, filter); ret = gst_caps_intersect (ret, filter);
} else { } else {
ret = gst_caps_ref (caps); gst_caps_ref (ret);
} }
return ret; return ret;
@ -667,15 +697,10 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
(GST_AGGREGATOR_GET_CLASS (vagg)->sinkpads_type); (GST_AGGREGATOR_GET_CLASS (vagg)->sinkpads_type);
GstAggregator *agg = GST_AGGREGATOR (vagg); GstAggregator *agg = GST_AGGREGATOR (vagg);
gboolean ret = TRUE, at_least_one_pad_configured = FALSE; gboolean ret = TRUE, at_least_one_pad_configured = FALSE;
GstVideoFormat best_format;
GstVideoInfo best_info;
gboolean at_least_one_alpha = FALSE; gboolean at_least_one_alpha = FALSE;
GstCaps *downstream_caps; GstCaps *downstream_caps;
GList *l; GList *l;
best_format = GST_VIDEO_FORMAT_UNKNOWN;
gst_video_info_init (&best_info);
downstream_caps = gst_pad_get_allowed_caps (agg->srcpad); downstream_caps = gst_pad_get_allowed_caps (agg->srcpad);
if (!downstream_caps || gst_caps_is_empty (downstream_caps)) { if (!downstream_caps || gst_caps_is_empty (downstream_caps)) {
@ -686,32 +711,6 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
return FALSE; return FALSE;
} }
if (vagg_klass->find_best_format) {
vagg_klass->find_best_format (vagg, downstream_caps, &best_info,
&at_least_one_alpha);
best_format = GST_VIDEO_INFO_FORMAT (&best_info);
}
if (best_format == GST_VIDEO_FORMAT_UNKNOWN) {
GstCaps *tmp = gst_caps_fixate (gst_caps_ref (downstream_caps));
gst_video_info_from_caps (&best_info, tmp);
best_format = GST_VIDEO_INFO_FORMAT (&best_info);
gst_caps_unref (tmp);
}
if (at_least_one_alpha
&& !(best_info.finfo->flags & GST_VIDEO_FORMAT_FLAG_ALPHA)) {
GST_ELEMENT_ERROR (vagg, CORE, NEGOTIATION,
("At least one of the input pads contains alpha, but downstream can't support alpha."),
("Either convert your inputs to not contain alpha or add a videoconvert after the aggregator"));
return FALSE;
}
GST_DEBUG_OBJECT (vagg,
"The output format will now be : %d with chroma : %s",
best_format, gst_video_chroma_to_string (best_info.chroma_site));
GST_OBJECT_LOCK (vagg); GST_OBJECT_LOCK (vagg);
for (l = GST_ELEMENT (vagg)->sinkpads; l; l = l->next) { for (l = GST_ELEMENT (vagg)->sinkpads; l; l = l->next) {
GstVideoAggregatorPad *mpad = l->data; GstVideoAggregatorPad *mpad = l->data;
@ -720,8 +719,10 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
|| GST_VIDEO_INFO_HEIGHT (&mpad->info) == 0) || GST_VIDEO_INFO_HEIGHT (&mpad->info) == 0)
continue; continue;
if (mpad->info.finfo->flags & GST_VIDEO_FORMAT_FLAG_ALPHA)
at_least_one_alpha = TRUE;
at_least_one_pad_configured = TRUE; at_least_one_pad_configured = TRUE;
break;
} }
GST_OBJECT_UNLOCK (vagg); GST_OBJECT_UNLOCK (vagg);
@ -731,6 +732,9 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
peercaps = gst_pad_peer_query_caps (agg->srcpad, NULL); peercaps = gst_pad_peer_query_caps (agg->srcpad, NULL);
g_assert (vagg_klass->update_caps); g_assert (vagg_klass->update_caps);
GST_DEBUG_OBJECT (vagg, "updating caps from %" GST_PTR_FORMAT,
downstream_caps);
GST_DEBUG_OBJECT (vagg, " with filter %" GST_PTR_FORMAT, peercaps);
if (!(caps = vagg_klass->update_caps (vagg, downstream_caps, peercaps))) { if (!(caps = vagg_klass->update_caps (vagg, downstream_caps, peercaps))) {
GST_WARNING_OBJECT (vagg, "Subclass failed to update provided caps"); GST_WARNING_OBJECT (vagg, "Subclass failed to update provided caps");
gst_caps_unref (downstream_caps); gst_caps_unref (downstream_caps);
@ -739,6 +743,8 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
ret = FALSE; ret = FALSE;
goto done; goto done;
} }
GST_DEBUG_OBJECT (vagg, " to %" GST_PTR_FORMAT, caps);
gst_caps_unref (downstream_caps); gst_caps_unref (downstream_caps);
if (peercaps) if (peercaps)
gst_caps_unref (peercaps); gst_caps_unref (peercaps);
@ -747,11 +753,36 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
g_assert (vagg_klass->fixate_caps); g_assert (vagg_klass->fixate_caps);
caps = gst_caps_make_writable (caps); caps = gst_caps_make_writable (caps);
GST_DEBUG_OBJECT (vagg, "fixate caps from %" GST_PTR_FORMAT, caps);
if (!(caps = vagg_klass->fixate_caps (vagg, caps))) { if (!(caps = vagg_klass->fixate_caps (vagg, caps))) {
GST_WARNING_OBJECT (vagg, "Subclass failed to fixate provided caps"); GST_WARNING_OBJECT (vagg, "Subclass failed to fixate provided caps");
ret = FALSE; ret = FALSE;
goto done; goto done;
} }
GST_DEBUG_OBJECT (vagg, " to %" GST_PTR_FORMAT, caps);
}
{
const GstVideoFormatInfo *finfo;
const gchar *v_format_str;
GstVideoFormat v_format;
GstStructure *s;
s = gst_caps_get_structure (caps, 0);
v_format_str = gst_structure_get_string (s, "format");
g_return_val_if_fail (v_format_str != NULL, FALSE);
v_format = gst_video_format_from_string (v_format_str);
g_return_val_if_fail (v_format != GST_VIDEO_FORMAT_UNKNOWN, FALSE);
finfo = gst_video_format_get_info (v_format);
g_return_val_if_fail (finfo != NULL, FALSE);
if (at_least_one_alpha && !(finfo->flags & GST_VIDEO_FORMAT_FLAG_ALPHA)) {
GST_ELEMENT_ERROR (vagg, CORE, NEGOTIATION,
("At least one of the input pads contains alpha, but configured caps don't support alpha."),
("Either convert your inputs to not contain alpha or add a videoconvert after the aggregator"));
ret = FALSE;
goto done;
}
} }
gst_video_info_from_caps (&vagg->info, caps); gst_video_info_from_caps (&vagg->info, caps);