mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 23:58:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoconvert: Hide all conversion related fields

Browse source 
And do not delay the setting of the conversion_info

https://bugzilla.gnome.org/show_bug.cgi?id=740768
This commit is contained in:
Thibault Saunier 2014-11-27 18:46:03 +01:00
parent d2cea992c0
commit a61d2e4e07
2 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,10 @@ struct _GstVideoAggregatorPadPrivate
{ {
/* Converter, if NULL no conversion is done */ /* Converter, if NULL no conversion is done */
GstVideoConverter *convert; GstVideoConverter *convert;
/* caps used for conversion if needed */
GstVideoInfo conversion_info;
GstBuffer *converted_buffer;
}; };
G_DEFINE_TYPE (GstVideoAggregatorPad, gst_videoaggregator_pad, G_DEFINE_TYPE (GstVideoAggregatorPad, gst_videoaggregator_pad,
@ -172,7 +176,9 @@ gst_video_aggregator_pad_set_info (GstVideoAggregatorPad * pad,
GST_VIDEO_INFO_FORMAT (wanted_info)); GST_VIDEO_INFO_FORMAT (wanted_info));
pad->priv->convert = pad->priv->convert =
gst_video_converter_new (current_info, &tmp_info, NULL); gst_video_converter_new (current_info, &tmp_info, NULL);
pad->need_conversion_update = TRUE; pad->priv->conversion_info = vagg->info;
gst_video_info_set_format (&(pad->priv->conversion_info),
GST_VIDEO_INFO_FORMAT (&vagg->info), pad->info.width, pad->info.height);
if (!pad->priv->convert) { if (!pad->priv->convert) {
g_free (colorimetry); g_free (colorimetry);
g_free (best_colorimetry); g_free (best_colorimetry);
@ -221,20 +227,12 @@ gst_video_aggregator_pad_prepare_frame (GstVideoAggregatorPad * pad,
converted_frame = g_slice_new0 (GstVideoFrame); converted_frame = g_slice_new0 (GstVideoFrame);
/* We wait until here to set the conversion infos, in case vagg->info changed */ /* We wait until here to set the conversion infos, in case vagg->info changed */
if (pad->need_conversion_update) { converted_size = pad->priv->conversion_info.size;
pad->conversion_info = vagg->info;
gst_video_info_set_format (&(pad->conversion_info),
GST_VIDEO_INFO_FORMAT (&vagg->info), pad->info.width,
pad->info.height);
pad->need_conversion_update = FALSE;
}
converted_size = pad->conversion_info.size;
outsize = GST_VIDEO_INFO_SIZE (&vagg->info); outsize = GST_VIDEO_INFO_SIZE (&vagg->info);
converted_size = converted_size > outsize ? converted_size : outsize; converted_size = converted_size > outsize ? converted_size : outsize;
converted_buf = gst_buffer_new_allocate (NULL, converted_size, &params); converted_buf = gst_buffer_new_allocate (NULL, converted_size, &params);
if (!gst_video_frame_map (converted_frame, &(pad->conversion_info), if (!gst_video_frame_map (converted_frame, &(pad->priv->conversion_info),
converted_buf, GST_MAP_READWRITE)) { converted_buf, GST_MAP_READWRITE)) {
GST_WARNING_OBJECT (vagg, "Could not map converted frame"); GST_WARNING_OBJECT (vagg, "Could not map converted frame");
@ -245,7 +243,7 @@ gst_video_aggregator_pad_prepare_frame (GstVideoAggregatorPad * pad,
} }
gst_video_converter_frame (pad->priv->convert, frame, converted_frame); gst_video_converter_frame (pad->priv->convert, frame, converted_frame);
pad->converted_buffer = converted_buf; pad->priv->converted_buffer = converted_buf;
gst_video_frame_unmap (frame); gst_video_frame_unmap (frame);
g_slice_free (GstVideoFrame, frame); g_slice_free (GstVideoFrame, frame);
} else { } else {
@ -267,9 +265,9 @@ gst_video_aggregator_pad_clean_frame (GstVideoAggregatorPad * pad,
pad->aggregated_frame = NULL; pad->aggregated_frame = NULL;
} }
if (pad->converted_buffer) { if (pad->priv->converted_buffer) {
gst_buffer_unref (pad->converted_buffer); gst_buffer_unref (pad->priv->converted_buffer);
pad->converted_buffer = NULL; pad->priv->converted_buffer = NULL;
} }
} }
@ -305,9 +303,8 @@ gst_videoaggregator_pad_init (GstVideoAggregatorPad * vaggpad)
GstVideoAggregatorPadPrivate); GstVideoAggregatorPadPrivate);
vaggpad->zorder = DEFAULT_PAD_ZORDER; vaggpad->zorder = DEFAULT_PAD_ZORDER;
vaggpad->need_conversion_update = FALSE;
vaggpad->aggregated_frame = NULL; vaggpad->aggregated_frame = NULL;
vaggpad->converted_buffer = NULL; vaggpad->priv->converted_buffer = NULL;
vaggpad->priv->convert = NULL; vaggpad->priv->convert = NULL;
} }

6
gst-libs/gst/video/gstvideoaggregatorpad.h
View file

@ -62,12 +62,6 @@ struct _GstVideoAggregatorPad
/* properties */ /* properties */
guint zorder; guint zorder;
/* caps used for conversion if needed */
GstVideoInfo conversion_info;
gboolean need_conversion_update;
GstBuffer *converted_buffer;
GstBuffer *buffer; GstBuffer *buffer;
GstVideoInfo buffer_vinfo; GstVideoInfo buffer_vinfo;