From: huzaifas@redhat.com
To: linux-media@vger.kernel.org
Cc: hdegoede@redhat.com, Huzaifa Sidhpurwala <huzaifas@redhat.com>
Subject: [PATCH] libv4l1: move v4l1 ioctls from kernel to libv4l1:VIDIOCGCHAN
Date: Tue, 25 May 2010 15:36:39 +0530 [thread overview]
Message-ID: <1274781999-19738-1-git-send-email-huzaifas@redhat.com> (raw)
From: Huzaifa Sidhpurwala <huzaifas@redhat.com>
move VIDIOCGCHAN to libv4l1
Signed-off-by: Huzaifa Sidhpurwala <huzaifas@redhat.com>
---
lib/libv4l1/libv4l1.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/lib/libv4l1/libv4l1.c b/lib/libv4l1/libv4l1.c
index 9bfddd3..f64025a 100644
--- a/lib/libv4l1/libv4l1.c
+++ b/lib/libv4l1/libv4l1.c
@@ -624,7 +624,44 @@ int v4l1_ioctl(int fd, unsigned long int request, ...)
if ((devices[index].flags & V4L1_SUPPORTS_ENUMINPUT) &&
(devices[index].flags & V4L1_SUPPORTS_ENUMSTD)) {
- result = SYS_IOCTL(fd, request, arg);
+
+ v4l2_std_id sid;
+
+ input2.index = chan->channel;
+ result = SYS_IOCTL(fd, VIDIOC_ENUMINPUT, &input2);
+ if (result < 0)
+ break;
+
+ chan->channel = input2.index;
+ memcpy(chan->name, input2.name,
+ min(sizeof(chan->name), sizeof(input2.name)));
+
+ chan->name[sizeof(chan->name) - 1] = 0;
+ chan->tuners =
+ (input2.type == V4L2_INPUT_TYPE_TUNER) ? 1 : 0;
+
+ chan->flags = (chan->tuners) ? VIDEO_VC_TUNER : 0;
+ switch (input2.type) {
+ case V4L2_INPUT_TYPE_TUNER:
+ chan->type = VIDEO_TYPE_TV;
+ break;
+ default:
+ case V4L2_INPUT_TYPE_CAMERA:
+ chan->type = VIDEO_TYPE_CAMERA;
+ break;
+ }
+ chan->norm = 0;
+ if (SYS_IOCTL(fd, VIDIOC_G_STD, &sid) == 0) {
+ if (sid & V4L2_STD_PAL)
+ chan->norm = VIDEO_MODE_PAL;
+ if (sid & V4L2_STD_NTSC)
+ chan->norm = VIDEO_MODE_NTSC;
+ if (sid & V4L2_STD_SECAM)
+ chan->norm = VIDEO_MODE_SECAM;
+ if (sid == V4L2_STD_ALL)
+ chan->norm = VIDEO_MODE_AUTO;
+ }
+
break;
}
--
1.6.6
next reply other threads:[~2010-05-25 10:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-25 10:06 huzaifas [this message]
2010-05-25 10:32 ` [PATCH] libv4l1: move v4l1 ioctls from kernel to libv4l1:VIDIOCGCHAN Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1274781999-19738-1-git-send-email-huzaifas@redhat.com \
--to=huzaifas@redhat.com \
--cc=hdegoede@redhat.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).