mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

compositor: use accessor macros for consistency

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=746147
This commit is contained in:
Nirbheek Chauhan 2015-04-18 15:09:02 +05:30 committed by Tim-Philipp Müller
parent 8f1edb69f4
commit 1817025ba0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/compositor/compositor.c
View file

@ -358,8 +358,8 @@ gst_compositor_pad_prepare_frame (GstVideoAggregatorPad * pad,
/* The only thing that can change here is the width /* The only thing that can change here is the width
* and height, otherwise set_info would've been called */ * and height, otherwise set_info would've been called */
if (cpad->conversion_info.width != width || if (GST_VIDEO_INFO_WIDTH (&cpad->conversion_info) != width ||
cpad->conversion_info.height != height) { GST_VIDEO_INFO_HEIGHT (&cpad->conversion_info) != height) {
gchar *colorimetry, *wanted_colorimetry; gchar *colorimetry, *wanted_colorimetry;
const gchar *chroma, *wanted_chroma; const gchar *chroma, *wanted_chroma;
@ -413,8 +413,8 @@ gst_compositor_pad_prepare_frame (GstVideoAggregatorPad * pad,
return FALSE; return FALSE;
} }
} else { } else {
cpad->conversion_info.width = width; GST_VIDEO_INFO_WIDTH (&cpad->conversion_info) = width;
cpad->conversion_info.height = height; GST_VIDEO_INFO_HEIGHT (&cpad->conversion_info) = height;
} }
g_free (colorimetry); g_free (colorimetry);
@ -486,7 +486,7 @@ gst_compositor_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 */
converted_size = cpad->conversion_info.size; converted_size = GST_VIDEO_INFO_SIZE (&cpad->conversion_info);
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);