The patch number 9861 was added via Jean-Francois Moine <moin...@free.fr>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
v4l-dvb-maintai...@linuxtv.org
------
From: Jean-Francois Moine <moin...@free.fr>
gspca - ov534: Accept many simultaneous webcams.
This patch moves the last fid and pts from static to the sd structure.
Priority: normal
Signed-off-by: Jean-Francois Moine <moin...@free.fr>
---
linux/drivers/media/video/gspca/ov534.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff -r 6db95dbb4afe -r ed7e923a7b96 linux/drivers/media/video/gspca/ov534.c
--- a/linux/drivers/media/video/gspca/ov534.c Thu Dec 04 08:52:40 2008 +0100
+++ b/linux/drivers/media/video/gspca/ov534.c Thu Dec 04 09:06:08 2008 +0100
@@ -48,6 +48,8 @@ static int frame_rate;
/* specific webcam descriptor */
struct sd {
struct gspca_dev gspca_dev; /* !! must be the first item */
+ __u32 last_fid;
+ __u32 last_pts;
};
/* V4L2 controls supported by the driver */
@@ -397,9 +399,8 @@ static void sd_pkt_scan(struct gspca_dev
static void sd_pkt_scan(struct gspca_dev *gspca_dev, struct gspca_frame *frame,
__u8 *data, int len)
{
- static __u32 last_pts;
+ struct sd *sd = (struct sd *) gspca_dev;
__u32 this_pts;
- static int last_fid;
int this_fid;
/* Payloads are prefixed with a the UVC-style header. We
@@ -428,10 +429,10 @@ static void sd_pkt_scan(struct gspca_dev
this_fid = (data[1] & UVC_STREAM_FID) ? 1 : 0;
/* If PTS or FID has changed, start a new frame. */
- if (this_pts != last_pts || this_fid != last_fid) {
+ if (this_pts != sd->last_pts || this_fid != sd->last_fid) {
gspca_frame_add(gspca_dev, FIRST_PACKET, frame, NULL, 0);
- last_pts = this_pts;
- last_fid = this_fid;
+ sd->last_pts = this_pts;
+ sd->last_fid = this_fid;
}
/* Add the data from this payload */
@@ -440,7 +441,7 @@ static void sd_pkt_scan(struct gspca_dev
/* If this packet is marked as EOF, end the frame */
if (data[1] & UVC_STREAM_EOF) {
- last_pts = 0;
+ sd->last_pts = 0;
if ((frame->data_end - frame->data) !=
(gspca_dev->width * gspca_dev->height * 2)) {
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/ed7e923a7b9628bdb2db6f43041a6eb32e250698
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
