Skip to contentSkip to conversation

gspca for_v3.4

PATCH In review Jean-Francois Moine 3 participants 5 messages Feb 27, 2012 – Mar 10, 2012 1 message not in the archive Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gspca for_v3.4

The following changes since commit a3db60bcf7671cc011ab4f848cbc40ff7ab52c1e:

[media] xc5000: declare firmware configuration structures as static const (2012-02-14 17:22:46 -0200)

are available in the git repository at:

git://linuxtv.org/jfrancois/gspca.git for_v3.4

for you to fetch changes up to 1b9ace2d5769c1676c96a6dc70ea84d2dea17140:

gspca - zc3xx: Set the exposure at start of hv7131r (2012-02-27 12:49:49 +0100)

----------------------------------------------------------------
Jean-François Moine (13):
gspca - pac7302: Add new webcam 06f8:301b
gspca - pac7302: Cleanup source
gspca - pac7302: Simplify the function pkt_scan
gspca - pac7302: Use the new video control mechanism gspca - pac7302: Do autogain setting work
gspca - sonixj: Remove the jpeg control
gspca - sonixj: Add exposure, gain and auto exposure for po2030n gspca - zc3xx: Adjust the JPEG decompression tables gspca - zc3xx: Do automatic transfer control for hv7131r and pas202b gspca - zc3xx: Remove the low level traces
gspca - zc3xx: Cleanup source
gspca - zc3xx: Fix bad sensor values when changing autogain gspca - zc3xx: Set the exposure at start of hv7131r

 Documentation/video4linux/gspca.txt |    1 +
 drivers/media/video/gspca/pac7302.c |  583 ++++++++++-------------------------
 drivers/media/video/gspca/sonixj.c  |  185 +++++++++---
 drivers/media/video/gspca/zc3xx.c   |  295 ++++++++++++------
 4 files changed, 511 insertions(+), 553 deletions(-)
Signature · 2 lines
Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/
#1 lore raw

Hi Jean-François,

Quoted 12 lines · Jean-Francois Moine

The following changes since commit a3db60bcf7671cc011ab4f848cbc40ff7ab52c1e:

   [media] xc5000: declare firmware configuration structures as static const (2012-02-14 17:22:46 -0200)

are available in the git repository at:

git://linuxtv.org/jfrancois/gspca.git for_v3.4

for you to fetch changes up to 1b9ace2d5769c1676c96a6dc70ea84d2dea17140:

   gspca - zc3xx: Set the exposure at start of hv7131r (2012-02-27 12:49:49 +0100)
Quoted 10 lines

----------------------------------------------------------------
Jean-François Moine (13):
gspca - pac7302: Add new webcam 06f8:301b
gspca - pac7302: Cleanup source
gspca - pac7302: Simplify the function pkt_scan
gspca - pac7302: Use the new video control mechanism gspca - pac7302: Do autogain setting work
gspca - sonixj: Remove the jpeg control
gspca - sonixj: Add exposure, gain and auto exposure for po2030n gspca - zc3xx: Adjust the JPEG decompression tables

This patch will conflict with patch:

gspca: zc3xx: Add V4L2_CID_JPEG_COMPRESSION_QUALITY control support

from my recent pull request http://patchwork.linuxtv.org/patch/10022/

How should we proceed with that ? Do you want me to remove the above patch from my pull request, or would you rebase your change set on top of mine ?

--
Best regards,
Sylwester

Quoted 12 lines

gspca - zc3xx: Do automatic transfer control for hv7131r and pas202b gspca - zc3xx: Remove the low level traces
gspca - zc3xx: Cleanup source
gspca - zc3xx: Fix bad sensor values when changing autogain gspca - zc3xx: Set the exposure at start of hv7131r

  Documentation/video4linux/gspca.txt |    1 +
  drivers/media/video/gspca/pac7302.c |  583 ++++++++++-------------------------
  drivers/media/video/gspca/sonixj.c  |  185 +++++++++---
  drivers/media/video/gspca/zc3xx.c   |  295 ++++++++++++------
  4 files changed, 511 insertions(+), 553 deletions(-)
#2 lore raw
Quoted 8 lines · On Mon, 27 Feb 2012 21:01:21 +0100 Sylwester Nawrocki <[email protected]> wrote:

This patch will conflict with patch:

gspca: zc3xx: Add V4L2_CID_JPEG_COMPRESSION_QUALITY control support

from my recent pull request http://patchwork.linuxtv.org/patch/10022/

How should we proceed with that ? Do you want me to remove the above patch from my pull request, or would you rebase your change set on top of mine ?

Hi Sylwester,

Sorry for the problem, I thought your patch was already in the media tree.

I checked the changes in zc3xx.c, and I have made many commits. So, it would be simpler if you would remove your patch. I could give you a merged one once the media tree would be updated.

Best regards.

Signature · 2 lines
Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/
#3 lore raw

Hi Jean-Francois,

Quoted 9 lines · Jean-Francois Moine
Quoted 6 lines · On Mon, 27 Feb 2012 21:01:21 +0100 Sylwester Nawrocki <[email protected]> wrote:

This patch will conflict with patch:

gspca: zc3xx: Add V4L2_CID_JPEG_COMPRESSION_QUALITY control support

from my recent pull request http://patchwork.linuxtv.org/patch/10022/

Quoted 7 lines
Quoted 2 lines

How should we proceed with that ? Do you want me to remove the above patch from my pull request, or would you rebase your change set on top of mine ?

Hi Sylwester,

Sorry for the problem, I thought your patch was already in the media tree.

Sorry about the delay, I was holding on for quite some time with pushing the patch upstream.

Quoted 3 lines

I checked the changes in zc3xx.c, and I have made many commits. So, it would be simpler if you would remove your patch. I could give you a merged one once the media tree would be updated.

OK, if it's easier please carry the patch in your tree. Otherwise, let me handle it after our pull request are included in the media tree.

Best regards,

Signature · 2 lines
Sylwester Nawrocki
Samsung Poland R&D Center

A message that is not in the archive (sent off-list or not yet received): 20120310123901.72aaa060@tele

#5 lore raw
Quoted 7 lines · Jean-Francois Moine
Quoted 4 lines · On Tue, 28 Feb 2012 12:15:43 +0100 Sylwester Nawrocki<[email protected]>…
Quoted 3 lines

I checked the changes in zc3xx.c, and I have made many commits. So, it would be simpler if you would remove your patch. I could give you a merged one once the media tree would be updated.

Quoted 8 lines
Quoted 2 lines

OK, if it's easier please carry the patch in your tree. Otherwise, let me handle it after our pull request are included in the media tree.

Hi Sylwester,

Here is the merge of your patch (origin media_tree staging/for_v3.4). As I have an other patch to do to the driver, I may add it to my changes once you have acked it (I have no webcam to test it).

Hi Jean-Francois,

thanks, I have tested your patch, but on the webcam I have (A4TECH PK-835):

[16803.614071] usb 2-1.1: new full speed USB device using ehci_hcd and address 10
[16803.708177] gspca: probing 0ac8:303b
[16804.634470] zc3xx: probe 2wr ov vga 0x0000
[16804.658594] zc3xx: probe sensor -> 0011
[16804.658601] zc3xx: Find Sensor HV7131R
[16804.659099] input: zc3xx as /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.1/input/input13
[16804.659512] gspca: video1 created

the JPEG quality control is disabled. I have removed the following line from the patch temporarily:

+ gspca_dev->ctrl_dis = (1 << QUALITY);

just to see if it appears. Of course due to the automatic transfer control introduced with patches starting from
http://git.linuxtv.org/media_tree.git/commit/30c73d464a10bee4bb8375bb2ed8cc102c507bb7
the jpeg quality control doesn't do anything useful.

So I can't really test the patch, but it looks fine for me. And if it's needed please include it in your other change set. FWIW,

--
Regards,
Sylwester