mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 19:20:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: Revert the last commit and handle resolutions differences properly

Browse source 
This is about converting the format, not about converting any widths and
heights. Subclasses are expected to handler different resolutions themselves,
like the videomixers already do properly.
This commit is contained in:
Sebastian Dröge 2014-10-01 17:18:05 +03:00
parent 154eb9b508
commit f2af838837
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,16 +447,14 @@ gst_videoaggregator_update_converters (GstVideoAggregator * vagg)
if (best_format != GST_VIDEO_INFO_FORMAT (&pad->info) ||
g_strcmp0 (colorimetry, best_colorimetry) ||
g_strcmp0 (chroma, best_chroma)) {
GstVideoInfo tmp_info = pad->info;
tmp_info.finfo = best_info.finfo;
GST_DEBUG_OBJECT (pad, "This pad will be converted from %d to %d",
GST_VIDEO_INFO_FORMAT (&pad->info),
GST_VIDEO_INFO_FORMAT (&best_info));
/* TODO: GstVideoConverter currently can't rescale! */
if (pad->info.width == best_info.width &&
pad->info.height == best_info.height &&
pad->info.par_n == best_info.par_n &&
pad->info.par_d == best_info.par_d)
pad->priv->convert =
gst_video_converter_new (&pad->info, &best_info, NULL);
pad->priv->convert =
gst_video_converter_new (&pad->info, &tmp_info, NULL);
pad->need_conversion_update = TRUE;
if (!pad->priv->convert) {
g_free (colorimetry);