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

v4l2sink: Only get/set overlay params if needed

Browse source 
it's perfectly ok for a video output device to not have overlay capabilities.
this patch removes the need to get/set the overlay parameters if the user
does not explicitely request one of the overlay properties
This commit is contained in:
IOhannes m zmölnig 2010-10-09 14:14:27 +02:00 committed by Sebastian Dröge
parent 4ba93e9f1a
commit b37845dac0
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sys/v4l2/gstv4l2sink.c
View file

@ -329,6 +329,9 @@ enum
static void static void
gst_v4l2sink_sync_overlay_fields (GstV4l2Sink * v4l2sink) gst_v4l2sink_sync_overlay_fields (GstV4l2Sink * v4l2sink)
{ {
if (!v4l2sink->overlay_fields_set)
return;
if (GST_V4L2_IS_OPEN (v4l2sink->v4l2object)) { if (GST_V4L2_IS_OPEN (v4l2sink->v4l2object)) {
gint fd = v4l2sink->v4l2object->video_fd; gint fd = v4l2sink->v4l2object->video_fd;
@ -339,19 +342,17 @@ gst_v4l2sink_sync_overlay_fields (GstV4l2Sink * v4l2sink)
g_return_if_fail (v4l2_ioctl (fd, VIDIOC_G_FMT, &format) >= 0); g_return_if_fail (v4l2_ioctl (fd, VIDIOC_G_FMT, &format) >= 0);
if (v4l2sink->overlay_fields_set) { if (v4l2sink->overlay_fields_set & OVERLAY_TOP_SET)
if (v4l2sink->overlay_fields_set & OVERLAY_TOP_SET) format.fmt.win.w.top = v4l2sink->overlay.top;
format.fmt.win.w.top = v4l2sink->overlay.top; if (v4l2sink->overlay_fields_set & OVERLAY_LEFT_SET)
if (v4l2sink->overlay_fields_set & OVERLAY_LEFT_SET) format.fmt.win.w.left = v4l2sink->overlay.left;
format.fmt.win.w.left = v4l2sink->overlay.left; if (v4l2sink->overlay_fields_set & OVERLAY_WIDTH_SET)
if (v4l2sink->overlay_fields_set & OVERLAY_WIDTH_SET) format.fmt.win.w.width = v4l2sink->overlay.width;
format.fmt.win.w.width = v4l2sink->overlay.width; if (v4l2sink->overlay_fields_set & OVERLAY_HEIGHT_SET)
if (v4l2sink->overlay_fields_set & OVERLAY_HEIGHT_SET) format.fmt.win.w.height = v4l2sink->overlay.height;
format.fmt.win.w.height = v4l2sink->overlay.height;
g_return_if_fail (v4l2_ioctl (fd, VIDIOC_S_FMT, &format) >= 0); g_return_if_fail (v4l2_ioctl (fd, VIDIOC_S_FMT, &format) >= 0);
v4l2sink->overlay_fields_set = 0; v4l2sink->overlay_fields_set = 0;
}
v4l2sink->overlay = format.fmt.win.w; v4l2sink->overlay = format.fmt.win.w;
} }