All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] libv4l1: move VIDIOCCAPTURE to libv4l1
@ 2010-06-04  7:40 huzaifas
  2010-06-07  7:41 ` Hans de Goede
  0 siblings, 1 reply; 2+ messages in thread
From: huzaifas @ 2010-06-04  7:40 UTC (permalink / raw)
  To: linux-media; +Cc: hdegoede, Huzaifa Sidhpurwala

From: Huzaifa Sidhpurwala <huzaifas@redhat.com>

move VIDIOCCAPTURE to libv4l1

Signed-of-by: Huzaifa Sidhpurwala <huzaifas@redhat.com>
---
 lib/libv4l1/libv4l1.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/lib/libv4l1/libv4l1.c b/lib/libv4l1/libv4l1.c
index 579f13b..2981c40 100644
--- a/lib/libv4l1/libv4l1.c
+++ b/lib/libv4l1/libv4l1.c
@@ -967,6 +967,22 @@ int v4l1_ioctl(int fd, unsigned long int request, ...)
 
 		break;
 	}
+
+	case VIDIOCCAPTURE: {
+		int *on = arg;
+		enum v4l2_buf_type captype = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+		if (0 == *on) {
+		/* dirty hack time.  But v4l1 has no STREAMOFF
+		* equivalent in the API, and this one at
+		* least comes close ... */
+			v4l2_ioctl(fd, VIDIOC_STREAMOFF, &captype);
+		}
+
+		result = v4l2_ioctl(fd, VIDIOC_OVERLAY, on);
+
+		break;
+	}
 	default:
 		/* Pass through libv4l2 for applications which are using v4l2 through
 		   libv4l1 (this can happen with the v4l1compat.so wrapper preloaded */
-- 
1.6.6.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] libv4l1: move VIDIOCCAPTURE to libv4l1
  2010-06-04  7:40 [PATCH] libv4l1: move VIDIOCCAPTURE to libv4l1 huzaifas
@ 2010-06-07  7:41 ` Hans de Goede
  0 siblings, 0 replies; 2+ messages in thread
From: Hans de Goede @ 2010-06-07  7:41 UTC (permalink / raw)
  To: huzaifas; +Cc: linux-media

Hi,

Looks good, applied

Thanks!

Regards,

Hans



On 06/04/2010 09:40 AM, huzaifas@redhat.com wrote:
> From: Huzaifa Sidhpurwala<huzaifas@redhat.com>
>
> move VIDIOCCAPTURE to libv4l1
>
> Signed-of-by: Huzaifa Sidhpurwala<huzaifas@redhat.com>
> ---
>   lib/libv4l1/libv4l1.c |   16 ++++++++++++++++
>   1 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/lib/libv4l1/libv4l1.c b/lib/libv4l1/libv4l1.c
> index 579f13b..2981c40 100644
> --- a/lib/libv4l1/libv4l1.c
> +++ b/lib/libv4l1/libv4l1.c
> @@ -967,6 +967,22 @@ int v4l1_ioctl(int fd, unsigned long int request, ...)
>
>   		break;
>   	}
> +
> +	case VIDIOCCAPTURE: {
> +		int *on = arg;
> +		enum v4l2_buf_type captype = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> +
> +		if (0 == *on) {
> +		/* dirty hack time.  But v4l1 has no STREAMOFF
> +		* equivalent in the API, and this one at
> +		* least comes close ... */
> +			v4l2_ioctl(fd, VIDIOC_STREAMOFF,&captype);
> +		}
> +
> +		result = v4l2_ioctl(fd, VIDIOC_OVERLAY, on);
> +
> +		break;
> +	}
>   	default:
>   		/* Pass through libv4l2 for applications which are using v4l2 through
>   		   libv4l1 (this can happen with the v4l1compat.so wrapper preloaded */

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-06-07  7:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-04  7:40 [PATCH] libv4l1: move VIDIOCCAPTURE to libv4l1 huzaifas
2010-06-07  7:41 ` Hans de Goede

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.