mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-17 04:45:47 +00:00
videomixer: some trivial cleanups
This commit is contained in:
parent
ac03ad782a
commit
3c0f18d765
1 changed files with 7 additions and 12 deletions
|
@ -1380,20 +1380,15 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
|
||||||
|
|
||||||
/* Calculating out buffer size from input size */
|
/* Calculating out buffer size from input size */
|
||||||
gst_pad_set_caps (mix->srcpad, newcaps);
|
gst_pad_set_caps (mix->srcpad, newcaps);
|
||||||
outsize =
|
|
||||||
gst_video_format_get_size (mix->fmt, mix->out_width, mix->out_height);
|
|
||||||
ret =
|
|
||||||
gst_pad_alloc_buffer_and_set_caps (mix->srcpad, GST_BUFFER_OFFSET_NONE,
|
|
||||||
outsize, newcaps, &outbuf);
|
|
||||||
gst_caps_unref (newcaps);
|
gst_caps_unref (newcaps);
|
||||||
} else { /* Otherwise we just allocate a buffer from current caps */
|
}
|
||||||
/* Calculating out buffer size from input size */
|
|
||||||
|
/* allocate an output buffer */
|
||||||
outsize =
|
outsize =
|
||||||
gst_video_format_get_size (mix->fmt, mix->out_width, mix->out_height);
|
gst_video_format_get_size (mix->fmt, mix->out_width, mix->out_height);
|
||||||
ret =
|
ret =
|
||||||
gst_pad_alloc_buffer_and_set_caps (mix->srcpad, GST_BUFFER_OFFSET_NONE,
|
gst_pad_alloc_buffer_and_set_caps (mix->srcpad, GST_BUFFER_OFFSET_NONE,
|
||||||
outsize, GST_PAD_CAPS (mix->srcpad), &outbuf);
|
outsize, GST_PAD_CAPS (mix->srcpad), &outbuf);
|
||||||
}
|
|
||||||
|
|
||||||
/* This must be set at this point, otherwise we have no src caps */
|
/* This must be set at this point, otherwise we have no src caps */
|
||||||
g_assert (mix->blend != NULL);
|
g_assert (mix->blend != NULL);
|
||||||
|
|
Loading…
Reference in a new issue