mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix calculation of 'expected size' for YV12 buffers.

Browse source 
Original commit message from CVS:
2008-04-07  Jan Schmidt  <jan.schmidt@sun.com>

* sys/xvimage/xvimagesink.c (gst_xvimagesink_xvimage_new),
(gst_xvimagesink_buffer_alloc):
Fix calculation of 'expected size' for YV12 buffers.
Be a little more verbose in the debug output for buffer-alloc'ed
buffers which turn out to have the wrong size.
This commit is contained in:
Jan Schmidt 2008-04-07 22:37:26 +00:00
parent de732ef41f
commit cd933152c7
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/xvimage/xvimagesink.c
View file

@ -579,6 +579,7 @@ gst_xvimagesink_xvimage_new (GstXvImageSink * xvimagesink, GstCaps * caps)
* number we get from X. */ * number we get from X. */
switch (xvimage->im_format) { switch (xvimage->im_format) {
case GST_MAKE_FOURCC ('I', '4', '2', '0'): case GST_MAKE_FOURCC ('I', '4', '2', '0'):
case GST_MAKE_FOURCC ('Y', 'V', '1', '2'):
expected_size = expected_size =
GST_ROUND_UP_2 (xvimage->height) * GST_ROUND_UP_4 (xvimage->width); GST_ROUND_UP_2 (xvimage->height) * GST_ROUND_UP_4 (xvimage->width);
expected_size += expected_size +=
@ -586,7 +587,6 @@ gst_xvimagesink_xvimage_new (GstXvImageSink * xvimagesink, GstCaps * caps)
2; 2;
break; break;
case GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'): case GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'):
case GST_MAKE_FOURCC ('Y', 'V', '1', '2'):
case GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'): case GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'):
expected_size = xvimage->height * GST_ROUND_UP_4 (xvimage->width * 2); expected_size = xvimage->height * GST_ROUND_UP_4 (xvimage->width * 2);
break; break;
@ -2266,9 +2266,9 @@ gst_xvimagesink_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
goto reuse_last_caps; goto reuse_last_caps;
} }
GST_DEBUG_OBJECT (xvimagesink, "buffer alloc requested with caps %" GST_DEBUG_OBJECT (xvimagesink, "buffer alloc requested size %d with caps %"
GST_PTR_FORMAT ", intersecting with our caps %" GST_PTR_FORMAT, caps, GST_PTR_FORMAT ", intersecting with our caps %" GST_PTR_FORMAT, size,
xvimagesink->xcontext->caps); caps, xvimagesink->xcontext->caps);
/* Check the caps against our xcontext */ /* Check the caps against our xcontext */
intersection = gst_caps_intersect (xvimagesink->xcontext->caps, caps); intersection = gst_caps_intersect (xvimagesink->xcontext->caps, caps);
@ -2387,6 +2387,8 @@ reuse_last_caps:
xvimage = gst_xvimagesink_xvimage_new (xvimagesink, intersection); xvimage = gst_xvimagesink_xvimage_new (xvimagesink, intersection);
if (xvimage && xvimage->size < size) { if (xvimage && xvimage->size < size) {
/* This image is unusable. Destroying... */ /* This image is unusable. Destroying... */
GST_LOG_OBJECT (xvimagesink, "Discarding allocated buffer as unsuitable. "
"Falling back to normal buffer");
gst_xvimage_buffer_free (xvimage); gst_xvimage_buffer_free (xvimage);
xvimage = NULL; xvimage = NULL;
} }