mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

v4l2: bufferpool: Fix buffer resize asserstion

Browse source 
When we fill a bitstream buffer the buffer might be too small to hold
the entire frame. Only resize to the filled size, preventing the
following assertion to happen.

  gst_buffer_resize_range: assertion 'bufmax >= bufoffs + offset + size' failed

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5100>
This commit is contained in:
Nicolas Dufresne 2023-07-25 12:19:22 -04:00 committed by GStreamer Marge Bot
parent d381a28beb
commit de5e1e334e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c
View file

@ -164,16 +164,18 @@ gst_v4l2_buffer_pool_copy_buffer (GstV4l2BufferPool * pool, GstBuffer * dest,
gst_video_frame_unmap (&dest_frame); gst_video_frame_unmap (&dest_frame);
} else { } else {
GstMapInfo map; GstMapInfo map;
gsize filled_size;
GST_DEBUG_OBJECT (pool, "copy raw bytes"); GST_DEBUG_OBJECT (pool, "copy raw bytes");
if (!gst_buffer_map (src, &map, GST_MAP_READ)) if (!gst_buffer_map (src, &map, GST_MAP_READ))
goto invalid_buffer; goto invalid_buffer;
gst_buffer_fill (dest, 0, map.data, gst_buffer_get_size (src)); filled_size =
gst_buffer_fill (dest, 0, map.data, gst_buffer_get_size (src));
gst_buffer_unmap (src, &map); gst_buffer_unmap (src, &map);
gst_buffer_resize (dest, 0, gst_buffer_get_size (src)); gst_buffer_resize (dest, 0, filled_size);
} }
gst_buffer_copy_into (dest, src, gst_buffer_copy_into (dest, src,