From 42e6cd6cfb452ee062c4131848dda4960079ac6d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 10 Jan 2012 13:23:34 -0300 Subject: [PATCH] --- yaml --- r: 286398 b: refs/heads/master c: 1c852201a28601b1379857f615e99071211294c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pwc/pwc-dec23.c | 6 ++++++ trunk/drivers/media/video/pwc/pwc-dec23.h | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 22068488a9df..0a1d02b75c00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 938d5b9e7c2e20a7e609ad5874c6e7d8d391e6e9 +refs/heads/master: 1c852201a28601b1379857f615e99071211294c6 diff --git a/trunk/drivers/media/video/pwc/pwc-dec23.c b/trunk/drivers/media/video/pwc/pwc-dec23.c index 6d48c1f90683..98772efc5bde 100644 --- a/trunk/drivers/media/video/pwc/pwc-dec23.c +++ b/trunk/drivers/media/video/pwc/pwc-dec23.c @@ -301,6 +301,9 @@ void pwc_dec23_init(struct pwc_device *pdev, unsigned char *cmd) mutex_init(&pdec->lock); + if (pdec->last_cmd_valid && pdec->last_cmd == cmd[2]) + return; + if (DEVICE_USE_CODEC3(pdev->type)) { flags = cmd[2] & 0x18; if (flags == 8) @@ -347,6 +350,9 @@ void pwc_dec23_init(struct pwc_device *pdev, unsigned char *cmd) for (i=0; ilast_cmd = cmd[2]; + pdec->last_cmd_valid = 1; } /* diff --git a/trunk/drivers/media/video/pwc/pwc-dec23.h b/trunk/drivers/media/video/pwc/pwc-dec23.h index a29068ee428b..af31d6047bb2 100644 --- a/trunk/drivers/media/video/pwc/pwc-dec23.h +++ b/trunk/drivers/media/video/pwc/pwc-dec23.h @@ -31,11 +31,14 @@ struct pwc_dec23_private { struct mutex lock; + unsigned char last_cmd, last_cmd_valid; + unsigned int scalebits; unsigned int nbitsmask, nbits; /* Number of bits of a color in the compressed stream */ unsigned int reservoir; unsigned int nbits_in_reservoir; + const unsigned char *stream; int temp_colors[16];