From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.124] helo=mx.sourceforge.net) by 3yr0jf1.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1MuhzW-00071C-HM for ltp-list@lists.sourceforge.net; Mon, 05 Oct 2009 07:28:18 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by 1b2kzd1.ch3.sourceforge.com with esmtp (Exim 4.69) id 1MuhzO-00018j-CH for ltp-list@lists.sourceforge.net; Mon, 05 Oct 2009 07:28:18 +0000 Message-ID: <4AC9A108.8040504@redhat.com> Date: Mon, 05 Oct 2009 09:32:24 +0200 From: Hans de Goede MIME-Version: 1.0 References: <4AC90BBF.9040803@freemail.hu> In-Reply-To: <4AC90BBF.9040803@freemail.hu> Subject: Re: [LTP] [PATCH] pac_common: redesign function for finding Start Of Frame List-Id: Linux Test Project General Discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ltp-list-bounces@lists.sourceforge.net To: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= Cc: Jean-Francois Moine , ltp-list@lists.sourceforge.net, LKML , Theodore Kilgore , Thomas Kaiser , Kyle Guinn , V4L Mailing List SGksCgpHb29kIG9uZSwKCkFja2VkLWJ5OiBIYW5zIGRlIEdvZWRlIDxoZGVnb2VkZUByZWRoYXQu Y29tPgoKSmVhbi1GcmFuY29pcywgY2FuIHlvdSBwbGVhc2UgYWRkIHRoaXMgcGF0Y2ggdG8geW91 ciB0cmVlPwoKVGhhbmtzLAoKSGFucwoKCk9uIDEwLzA0LzIwMDkgMTA6NTUgUE0sIE7DqW1ldGgg TcOhcnRvbiB3cm90ZToKPiBGcm9tOiBNw6FydG9uIE7DqW1ldGg8bm0xMjdAZnJlZW1haWwuaHU+ Cj4KPiBUaGUgb3JpZ2luYWwgaW1wbGVtZW50YXRpb24gb2YgcGFjX2ZpbmRfc29mKCkgZG9lcyBu b3QgYWx3YXlzIGZpbmQKPiB0aGUgU3RhcnQgT2YgRnJhbWUgKFNPRikgbWFya2VyLiBSZXBsYWNl IGl0IHdpdGggYSBzdGF0ZSBtYWNoaW5lCj4gYmFzZWQgZGVzaWduLgo+Cj4gVGhlIGNoYW5nZSB3 YXMgdGVzdGVkIHdpdGggTGFidGVjIFdlYmNhbSAyMjAwLgo+Cj4gU2lnbmVkLW9mZi1ieTogTcOh cnRvbiBOw6ltZXRoPG5tMTI3QGZyZWVtYWlsLmh1Pgo+IC0tLQo+IC0tLSBsaW51eC0yLjYuMzIt cmMxLm9yaWcvZHJpdmVycy9tZWRpYS92aWRlby9nc3BjYS9wYWNfY29tbW9uLmgJMjAwOS0wOS0x MCAwMDoxMzo1OS4wMDAwMDAwMDAgKzAyMDAKPiArKysgbGludXgtMi42LjMyLXJjMS9kcml2ZXJz L21lZGlhL3ZpZGVvL2dzcGNhL3BhY19jb21tb24uaAkyMDA5LTEwLTA0IDIxOjQ5OjE5LjAwMDAw MDAwMCArMDIwMAo+IEBAIC0zMyw2ICszMyw0NSBAQAo+ICAgc3RhdGljIGNvbnN0IHVuc2lnbmVk IGNoYXIgcGFjX3NvZl9tYXJrZXJbNV0gPQo+ICAgCQl7IDB4ZmYsIDB4ZmYsIDB4MDAsIDB4ZmYs IDB4OTYgfTsKPgo+ICsvKgo+ICsgICBUaGUgZm9sbG93aW5nIHN0YXRlIG1hY2hpbmUgZmluZHMg dGhlIFNPRiBtYXJrZXIgc2VxdWVuY2UKPiArICAgMHhmZiwgMHhmZiwgMHgwMCwgMHhmZiwgMHg5 NiBpbiBhIGJ5dGUgc3RyZWFtLgo+ICsKPiArCSAgICstLS0tLS0tLS0tKwo+ICsJICAgfCAwOiBT VEFSVCB8PC0tLS0tLS0tLS0tLS0tLVwKPiArCSAgICstLS0tLS0tLS0tKzwtXCAgICAgICAgICAg ICB8Cj4gKwkgICAgIHwgICAgICAgXC0tLS9vdGhlcndpc2UgICAgfAo+ICsJICAgICB2IDB4ZmYg ICAgICAgICAgICAgICAgICAgIHwKPiArCSAgICstLS0tLS0tLS0tKyBvdGhlcndpc2UgICAgICB8 Cj4gKwkgICB8ICAgICAxICAgIHwtLS0tLS0tLS0tLS0tLS0+Kgo+ICsJICAgfCAgICAgICAgICB8 ICAgICAgICAgICAgICAgIF4KPiArCSAgICstLS0tLS0tLS0tKyAgICAgICAgICAgICAgICB8Cj4g KwkgICAgIHwgICAgICAgICAgICAgICAgICAgICAgICAgfAo+ICsJICAgICB2IDB4ZmYgICAgICAg ICAgICAgICAgICAgIHwKPiArCSAgICstLS0tLS0tLS0tKzwtXDB4ZmYgICAgICAgICB8Cj4gKwkv LT58ICAgICAgICAgIHwtLS8gICAgICAgICAgICAgfAo+ICsJfCAgfCAgICAgMiAgICB8LS0tLS0t LS0tLS0tLS0tPioKPiArCXwgIHwgICAgICAgICAgfCBvdGhlcndpc2UgICAgICBeCj4gKwl8ICAr LS0tLS0tLS0tLSsgICAgICAgICAgICAgICAgfAo+ICsJfCAgICB8ICAgICAgICAgICAgICAgICAg ICAgICAgIHwKPiArCXwgICAgdiAweDAwICAgICAgICAgICAgICAgICAgICB8Cj4gKwl8ICArLS0t LS0tLS0tLSsgICAgICAgICAgICAgICAgfAo+ICsJfCAgfCAgICAgMyAgICB8ICAgICAgICAgICAg ICAgIHwKPiArCXwgIHwgICAgICAgICAgfC0tLS0tLS0tLS0tLS0tLT4qCj4gKwl8ICArLS0tLS0t LS0tLSsgb3RoZXJ3aXNlICAgICAgXgo+ICsJfCAgICB8ICAgICAgICAgICAgICAgICAgICAgICAg IHwKPiArICAgMHhmZiB8ICAgIHYgMHhmZiAgICAgICAgICAgICAgICAgICAgfAo+ICsJfCAgKy0t LS0tLS0tLS0rICAgICAgICAgICAgICAgIHwKPiArCVwtLXwgICAgIDQgICAgfCAgICAgICAgICAg ICAgICB8Cj4gKwkgICB8ICAgICAgICAgIHwtLS0tLS0tLS0tLS0tLS0tLwo+ICsJICAgKy0tLS0t LS0tLS0rIG90aGVyd2lzZQo+ICsJICAgICB8Cj4gKwkgICAgIHYgMHg5Ngo+ICsJICAgKy0tLS0t LS0tLS0rCj4gKwkgICB8ICBGT1VORCAgIHwKPiArCSAgICstLS0tLS0tLS0tKwo+ICsqLwo+ICsK PiAgIHN0YXRpYyB1bnNpZ25lZCBjaGFyICpwYWNfZmluZF9zb2Yoc3RydWN0IGdzcGNhX2RldiAq Z3NwY2FfZGV2LAo+ICAgCQkJCQl1bnNpZ25lZCBjaGFyICptLCBpbnQgbGVuKQo+ICAgewo+IEBA IC00MSwxNyArODAsNTQgQEAgc3RhdGljIHVuc2lnbmVkIGNoYXIgKnBhY19maW5kX3NvZihzdHJ1 Ywo+Cj4gICAJLyogU2VhcmNoIGZvciB0aGUgU09GIG1hcmtlciAoZml4ZWQgcGFydCkgaW4gdGhl IGhlYWRlciAqLwo+ICAgCWZvciAoaSA9IDA7IGk8ICBsZW47IGkrKykgewo+IC0JCWlmIChtW2ld ID09IHBhY19zb2ZfbWFya2VyW3NkLT5zb2ZfcmVhZF0pIHsKPiAtCQkJc2QtPnNvZl9yZWFkKys7 Cj4gLQkJCWlmIChzZC0+c29mX3JlYWQgPT0gc2l6ZW9mKHBhY19zb2ZfbWFya2VyKSkgewo+ICsJ CXN3aXRjaCAoc2QtPnNvZl9yZWFkKSB7Cj4gKwkJY2FzZSAwOgo+ICsJCQlpZiAobVtpXSA9PSAw eGZmKQo+ICsJCQkJc2QtPnNvZl9yZWFkID0gMTsKPiArCQkJYnJlYWs7Cj4gKwkJY2FzZSAxOgo+ ICsJCQlpZiAobVtpXSA9PSAweGZmKQo+ICsJCQkJc2QtPnNvZl9yZWFkID0gMjsKPiArCQkJZWxz ZQo+ICsJCQkJc2QtPnNvZl9yZWFkID0gMDsKPiArCQkJYnJlYWs7Cj4gKwkJY2FzZSAyOgo+ICsJ CQlzd2l0Y2ggKG1baV0pIHsKPiArCQkJY2FzZSAweDAwOgo+ICsJCQkJc2QtPnNvZl9yZWFkID0g MzsKPiArCQkJCWJyZWFrOwo+ICsJCQljYXNlIDB4ZmY6Cj4gKwkJCQkvKiBzdGF5IGluIHRoaXMg c3RhdGUgKi8KPiArCQkJCWJyZWFrOwo+ICsJCQlkZWZhdWx0Ogo+ICsJCQkJc2QtPnNvZl9yZWFk ID0gMDsKPiArCQkJfQo+ICsJCQlicmVhazsKPiArCQljYXNlIDM6Cj4gKwkJCWlmIChtW2ldID09 IDB4ZmYpCj4gKwkJCQlzZC0+c29mX3JlYWQgPSA0Owo+ICsJCQllbHNlCj4gKwkJCQlzZC0+c29m X3JlYWQgPSAwOwo+ICsJCQlicmVhazsKPiArCQljYXNlIDQ6Cj4gKwkJCXN3aXRjaCAobVtpXSkg ewo+ICsJCQljYXNlIDB4OTY6Cj4gKwkJCQkvKiBQYXR0ZXJuIGZvdW5kICovCj4gICAJCQkJUERF QlVHKERfRlJBTSwKPiAgIAkJCQkJIlNPRiBmb3VuZCwgYnl0ZXMgdG8gYW5hbHl6ZTogJXUuIgo+ ICAgCQkJCQkiIEZyYW1lIHN0YXJ0cyBhdCBieXRlICMldSIsCj4gICAJCQkJCWxlbiwgaSArIDEp Owo+ICAgCQkJCXNkLT5zb2ZfcmVhZCA9IDA7Cj4gICAJCQkJcmV0dXJuIG0gKyBpICsgMTsKPiAr CQkJCWJyZWFrOwo+ICsJCQljYXNlIDB4ZmY6Cj4gKwkJCQlzZC0+c29mX3JlYWQgPSAyOwo+ICsJ CQkJYnJlYWs7Cj4gKwkJCWRlZmF1bHQ6Cj4gKwkJCQlzZC0+c29mX3JlYWQgPSAwOwo+ICAgCQkJ fQo+IC0JCX0gZWxzZSB7Cj4gKwkJCWJyZWFrOwo+ICsJCWRlZmF1bHQ6Cj4gICAJCQlzZC0+c29m X3JlYWQgPSAwOwo+ICAgCQl9Cj4gICAJfQo+IC0tCj4gVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlz IGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LW1lZGlhIiBpbgo+IHRoZSBi b2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCj4gTW9yZSBtYWpv cmRvbW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1s CgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQ29tZSBidWlsZCB3aXRoIHVzISBUaGUgQmxhY2tCZXJy eSZyZWc7IERldmVsb3BlciBDb25mZXJlbmNlIGluIFNGLCBDQQppcyB0aGUgb25seSBkZXZlbG9w ZXIgZXZlbnQgeW91IG5lZWQgdG8gYXR0ZW5kIHRoaXMgeWVhci4gSnVtcHN0YXJ0IHlvdXIKZGV2 ZWxvcGluZyBza2lsbHMsIHRha2UgQmxhY2tCZXJyeSBtb2JpbGUgYXBwbGljYXRpb25zIHRvIG1h cmtldCBhbmQgc3RheSAKYWhlYWQgb2YgdGhlIGN1cnZlLiBKb2luIHVzIGZyb20gTm92ZW1iZXIg OSYjNDU7MTIsIDIwMDkuIFJlZ2lzdGVyIG5vdyYjMzM7Cmh0dHA6Ly9wLnNmLm5ldC9zZnUvZGV2 Y29uZgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMdHAt bGlzdCBtYWlsaW5nIGxpc3QKTHRwLWxpc3RAbGlzdHMuc291cmNlZm9yZ2UubmV0Cmh0dHBzOi8v bGlzdHMuc291cmNlZm9yZ2UubmV0L2xpc3RzL2xpc3RpbmZvL2x0cC1saXN0Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758555AbZJEH2q (ORCPT ); Mon, 5 Oct 2009 03:28:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758492AbZJEH2p (ORCPT ); Mon, 5 Oct 2009 03:28:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59053 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758441AbZJEH2o (ORCPT ); Mon, 5 Oct 2009 03:28:44 -0400 Message-ID: <4AC9A108.8040504@redhat.com> Date: Mon, 05 Oct 2009 09:32:24 +0200 From: Hans de Goede User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20090922 Fedora/3.0-3.9.b4.fc12 Thunderbird/3.0b4 MIME-Version: 1.0 To: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= CC: Jean-Francois Moine , Thomas Kaiser , Kyle Guinn , Theodore Kilgore , V4L Mailing List , LKML , ltp-list@lists.sourceforge.net Subject: Re: [PATCH] pac_common: redesign function for finding Start Of Frame References: <4AC90BBF.9040803@freemail.hu> In-Reply-To: <4AC90BBF.9040803@freemail.hu> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Good one, Acked-by: Hans de Goede Jean-Francois, can you please add this patch to your tree? Thanks, Hans On 10/04/2009 10:55 PM, Németh Márton wrote: > From: Márton Németh > > The original implementation of pac_find_sof() does not always find > the Start Of Frame (SOF) marker. Replace it with a state machine > based design. > > The change was tested with Labtec Webcam 2200. > > Signed-off-by: Márton Németh > --- > --- linux-2.6.32-rc1.orig/drivers/media/video/gspca/pac_common.h 2009-09-10 00:13:59.000000000 +0200 > +++ linux-2.6.32-rc1/drivers/media/video/gspca/pac_common.h 2009-10-04 21:49:19.000000000 +0200 > @@ -33,6 +33,45 @@ > static const unsigned char pac_sof_marker[5] = > { 0xff, 0xff, 0x00, 0xff, 0x96 }; > > +/* > + The following state machine finds the SOF marker sequence > + 0xff, 0xff, 0x00, 0xff, 0x96 in a byte stream. > + > + +----------+ > + | 0: START |<---------------\ > + +----------+<-\ | > + | \---/otherwise | > + v 0xff | > + +----------+ otherwise | > + | 1 |--------------->* > + | | ^ > + +----------+ | > + | | > + v 0xff | > + +----------+<-\0xff | > + /->| |--/ | > + | | 2 |--------------->* > + | | | otherwise ^ > + | +----------+ | > + | | | > + | v 0x00 | > + | +----------+ | > + | | 3 | | > + | | |--------------->* > + | +----------+ otherwise ^ > + | | | > + 0xff | v 0xff | > + | +----------+ | > + \--| 4 | | > + | |----------------/ > + +----------+ otherwise > + | > + v 0x96 > + +----------+ > + | FOUND | > + +----------+ > +*/ > + > static unsigned char *pac_find_sof(struct gspca_dev *gspca_dev, > unsigned char *m, int len) > { > @@ -41,17 +80,54 @@ static unsigned char *pac_find_sof(struc > > /* Search for the SOF marker (fixed part) in the header */ > for (i = 0; i< len; i++) { > - if (m[i] == pac_sof_marker[sd->sof_read]) { > - sd->sof_read++; > - if (sd->sof_read == sizeof(pac_sof_marker)) { > + switch (sd->sof_read) { > + case 0: > + if (m[i] == 0xff) > + sd->sof_read = 1; > + break; > + case 1: > + if (m[i] == 0xff) > + sd->sof_read = 2; > + else > + sd->sof_read = 0; > + break; > + case 2: > + switch (m[i]) { > + case 0x00: > + sd->sof_read = 3; > + break; > + case 0xff: > + /* stay in this state */ > + break; > + default: > + sd->sof_read = 0; > + } > + break; > + case 3: > + if (m[i] == 0xff) > + sd->sof_read = 4; > + else > + sd->sof_read = 0; > + break; > + case 4: > + switch (m[i]) { > + case 0x96: > + /* Pattern found */ > PDEBUG(D_FRAM, > "SOF found, bytes to analyze: %u." > " Frame starts at byte #%u", > len, i + 1); > sd->sof_read = 0; > return m + i + 1; > + break; > + case 0xff: > + sd->sof_read = 2; > + break; > + default: > + sd->sof_read = 0; > } > - } else { > + break; > + default: > sd->sof_read = 0; > } > } > -- > 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