From patchwork Sat Mar 7 17:41:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kilgota@banach.math.auburn.edu X-Patchwork-Id: 10487 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n27HUZ5L022363 for ; Sat, 7 Mar 2009 17:30:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753463AbZCGRaf (ORCPT ); Sat, 7 Mar 2009 12:30:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755184AbZCGRaf (ORCPT ); Sat, 7 Mar 2009 12:30:35 -0500 Received: from banach.math.auburn.edu ([131.204.45.3]:37152 "EHLO banach.math.auburn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753463AbZCGRae (ORCPT ); Sat, 7 Mar 2009 12:30:34 -0500 Received: from banach.math.auburn.edu (localhost [127.0.0.1]) by banach.math.auburn.edu (8.14.3/8.14.2) with ESMTP id n27Hfi9P007921; Sat, 7 Mar 2009 11:41:44 -0600 Received: from localhost (kilgota@localhost) by banach.math.auburn.edu (8.14.3/8.14.2/Submit) with ESMTP id n27HfidW007918; Sat, 7 Mar 2009 11:41:44 -0600 Date: Sat, 7 Mar 2009 11:41:44 -0600 (CST) From: kilgota@banach.math.auburn.edu To: Hans de Goede cc: Kyle Guinn , linux-media@vger.kernel.org, Jean-Francois Moine Subject: [PATCH] for the file gspca/mr97310a.c (Resubmit) Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Here is a cleaned-up version of the patch to gspca/mr97310a.c This patch causes all frame headers in the streaming output of MR97310A cameras, instead of being discarded. Said frame headers contain information which may be useful in processing the video output and therefore should be kept and not discarded. A corresponding patch to the decompression algorithm in libv4lconvert/mr97310a.c corrects the change in frame offset. Signed-off-by: Theodore Kilgore ---------------------------------------------------------------------------- --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- mr97310a.c.orig 2009-02-18 14:40:03.000000000 -0600 +++ mr97310a.c 2009-03-06 15:12:14.000000000 -0600 @@ -29,9 +29,7 @@ MODULE_LICENSE("GPL"); /* specific webcam descriptor */ struct sd { struct gspca_dev gspca_dev; /* !! must be the first item */ - u8 sof_read; - u8 header_read; }; /* V4L2 controls supported by the driver */ @@ -285,7 +283,6 @@ static void sd_pkt_scan(struct gspca_dev __u8 *data, /* isoc packet */ int len) /* iso packet length */ { - struct sd *sd = (struct sd *) gspca_dev; unsigned char *sof; sof = pac_find_sof(gspca_dev, data, len); @@ -300,25 +297,12 @@ static void sd_pkt_scan(struct gspca_dev n = 0; frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, data, n); - sd->header_read = 0; - gspca_frame_add(gspca_dev, FIRST_PACKET, frame, NULL, 0); + /* Start next frame. */ + gspca_frame_add(gspca_dev, FIRST_PACKET, frame, + pac_sof_marker, sizeof pac_sof_marker); len -= sof - data; data = sof; } - if (sd->header_read < 7) { - int needed; - - /* skip the rest of the header */ - needed = 7 - sd->header_read; - if (len <= needed) { - sd->header_read += len; - return; - } - data += needed; - len -= needed; - sd->header_read = 7; - } - gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); }