Re: [PATCH 03/23] V4L: Add an extended camera white balance control
Hi Sylwester, On Tue, May 15, 2012 at 11:28:03PM +0200, Sylwester Nawrocki wrote: > Hi Sakari, > > On 05/14/2012 02:02 AM, Sakari Ailus wrote: > > Hi Sylwester, > > > > Thanks for the patch. I noticed your pull req; I hope you could take into > > account a few more comments. :) > > Thank you for your comments, I'll try to come up with a fix up patch. > > > On Thu, May 10, 2012 at 12:30:38PM +0200, Sylwester Nawrocki wrote: > >> This patch adds V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE control which is > >> an extended version of the V4L2_CID_AUTO_WHITE_BALANCE control, > >> including white balance presets. The following presets are defined: > >> > >> - V4L2_WHITE_BALANCE_INCANDESCENT, > >> - V4L2_WHITE_BALANCE_FLUORESCENT, > >> - V4L2_WHITE_BALANCE_FLUORESCENT_H, > >> - V4L2_WHITE_BALANCE_HORIZON, > >> - V4L2_WHITE_BALANCE_DAYLIGHT, > >> - V4L2_WHITE_BALANCE_FLASH, > >> - V4L2_WHITE_BALANCE_CLOUDY, > >> - V4L2_WHITE_BALANCE_SHADE. > >> > >> Signed-off-by: HeungJun Kim > >> Signed-off-by: Sylwester Nawrocki > >> Signed-off-by: Kyungmin Park > >> Acked-by: Hans de Goede > >> --- > >> Documentation/DocBook/media/v4l/controls.xml | 70 > >> ++ > >> drivers/media/video/v4l2-ctrls.c | 17 +++ > >> include/linux/videodev2.h| 14 ++ > >> 3 files changed, 101 insertions(+) > >> > >> diff --git a/Documentation/DocBook/media/v4l/controls.xml > >> b/Documentation/DocBook/media/v4l/controls.xml > >> index 40e6485..85d1ca0 100644 > >> --- a/Documentation/DocBook/media/v4l/controls.xml > >> +++ b/Documentation/DocBook/media/v4l/controls.xml > >> @@ -3022,6 +3022,76 @@ camera sensor on or off, or specify its strength. > >> Such band-stop filters can > >> be used, for example, to filter out the fluorescent light > >> component. > >> > >> > >> + > >> + > >> + >> spanname="id">V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE > >> + enum v4l2_auto_n_preset_white_balance > >> + Sets white balance to automatic, > >> +manual or a preset. The presets determine color temperature of the light > >> as > >> +a hint to the camera for white balance adjustments resulting in most > >> accurate > >> +color representation. The following white balance presets are listed in > >> order > >> +of increasing color temperature. > >> + > >> + > >> + > >> + > >> + > >> + > >> V4L2_WHITE_BALANCE_MANUAL > >> + Manual white balance. > >> + > >> + > >> + > >> V4L2_WHITE_BALANCE_AUTO > >> + Automatic white balance adjustments. > >> + > >> + > >> + > >> V4L2_WHITE_BALANCE_INCANDESCENT > >> + White balance setting for incandescent (tungsten) > >> lighting. > >> +It generally cools down the colors and corresponds approximately to > >> 2500...3500 K > >> +color temperature range. > >> + > >> + > >> + > >> V4L2_WHITE_BALANCE_FLUORESCENT > >> + White balance preset for fluorescent lighting. > >> +It corresponds approximately to 4000...5000 K color temperature. > >> + > >> + > >> + > >> V4L2_WHITE_BALANCE_FLUORESCENT_H > >> + With this setting the camera will compensate for > >> +fluorescent H lighting. > >> + > > > > I don't remember for quite sure if I replied to this already... what's the > > diff between the above two? > > No, you didn't, otherwise I would certainly remember that ;) > > V4L2_WHITE_BALANCE_FLUORESCENT_H is for newer, daylight calibrated fluorescent > lamps. So this preset will generally cool down the colours less than > V4L2_WHITE_BALANCE_FLUORESCENT. I was even thinking about a separate control > for V4L2_WHITE_BALANCE_FLUORESCENT, since some ISPs have several presets for > fluorescent lighting. I dropped that idea finally though. I don't know about the daylight calibrated ones, but the older ones often tend to give colder light. Nevertheless, I think it'd be good to mention this in the documentation. I couldn't thave guessed it. :) > > The colour temperature of the fluorescent light depends on the lamp; 2500 K > > is not uncommon here in Finland. It's the spectrum that's different from > > incandescents, not necessarily the colour temperature. > > > >> + > >> + > >> V4L2_WHITE_BALANCE_HORIZON > >> + White balance setting for horizon daylight. > >> +It corresponds approximately to 5000 K color temperature. > >> + > >> + > >> + > >> V4L2_WHITE_BALANCE_DAYLIGHT > >> + White balance preset for daylight (with clear sky). > >> +It corresponds approximately to 5000...6500 K color temperature. > >> + > >> + > >> + > >> V4L2_WHITE_BALANCE_FLASH > >> + With this setting the camera will compensate for the > >> flash > >> +light. It slightly warms up the colors and corresponds roughly to > >> 5000...5500 K > >> +color temperat
[PATCH 1/1] as3645a: Remove set_power() from platform data
The chip is typically powered constantly and no board uses the set_power()
callback. Remove it.
Signed-off-by: Sakari Ailus
---
drivers/media/video/as3645a.c | 39 +--
include/media/as3645a.h |1 -
2 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/drivers/media/video/as3645a.c b/drivers/media/video/as3645a.c
index c4b0357..7454660 100644
--- a/drivers/media/video/as3645a.c
+++ b/drivers/media/video/as3645a.c
@@ -512,31 +512,6 @@ static int as3645a_setup(struct as3645a *flash)
return ret & ~AS_FAULT_INFO_LED_AMOUNT ? -EIO : 0;
}
-static int __as3645a_set_power(struct as3645a *flash, int on)
-{
- int ret;
-
- if (!on)
- as3645a_set_control(flash, AS_MODE_EXT_TORCH, false);
-
- if (flash->pdata->set_power) {
- ret = flash->pdata->set_power(&flash->subdev, on);
- if (ret < 0)
- return ret;
- }
-
- if (!on)
- return 0;
-
- ret = as3645a_setup(flash);
- if (ret < 0) {
- if (flash->pdata->set_power)
- flash->pdata->set_power(&flash->subdev, 0);
- }
-
- return ret;
-}
-
static int as3645a_set_power(struct v4l2_subdev *sd, int on)
{
struct as3645a *flash = to_as3645a(sd);
@@ -545,9 +520,13 @@ static int as3645a_set_power(struct v4l2_subdev *sd, int
on)
mutex_lock(&flash->power_lock);
if (flash->power_count == !on) {
- ret = __as3645a_set_power(flash, !!on);
- if (ret < 0)
- goto done;
+ if (!on) {
+ as3645a_set_control(flash, AS_MODE_EXT_TORCH, false);
+ } else {
+ ret = as3645a_setup(flash);
+ if (ret < 0)
+ goto done;
+ }
}
flash->power_count += on ? 1 : -1;
@@ -675,7 +654,7 @@ static int as3645a_suspend(struct device *dev)
if (flash->power_count == 0)
return 0;
- rval = __as3645a_set_power(flash, 0);
+ rval = as3645a_set_control(flash, AS_MODE_EXT_TORCH, false);
dev_dbg(&client->dev, "Suspend %s\n", rval < 0 ? "failed" : "ok");
@@ -692,7 +671,7 @@ static int as3645a_resume(struct device *dev)
if (flash->power_count == 0)
return 0;
- rval = __as3645a_set_power(flash, 1);
+ rval = as3645a_setup(flash);
dev_dbg(&client->dev, "Resume %s\n", rval < 0 ? "fail" : "ok");
diff --git a/include/media/as3645a.h b/include/media/as3645a.h
index 5075496..a83ab3a 100644
--- a/include/media/as3645a.h
+++ b/include/media/as3645a.h
@@ -57,7 +57,6 @@
* @timeout_max: Max flash timeout (us, <= AS3645A_FLASH_TIMEOUT_MAX)
*/
struct as3645a_platform_data {
- int (*set_power)(struct v4l2_subdev *subdev, int on);
unsigned int vref;
unsigned int peak;
bool ext_strobe;
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Status of gstreamer video capture/encoding
Hi all, I am trying to understand the current state of video capture and encoding using gstreamer for kernels >= 2.6.39 on an OMAP3530. Currently on 2.6.34 (omap3-2.6.34-caspapx) I use essentially: v4l2src ! TIVidenc1 codecName=h264enc ! rtph264pay ! udpsink 1) As far as I understand, 'yavta' is currently the only way to capture from media-ctl-based cameras -- gstreamer's v4l2src doesn't work for these cameras. Is this correct? 2) I have read that 'subdevsrc' or 'mcsrc' is capable of doing this [1], though I'm not sure whether they're somehow meego-specific. Has anyone tried these source elements on a Gumstix Overo? 3) As far as using the DSP for encoding video, Last I heard no one had done it yet [2]. Has anyone had success with either 'gst-ti', 'gst-dsp', or 'gst-openmax' [3,4,5] on 3.x kernels? Thanks in advance, Simon. [1]: http://www.spinics.net/lists/linux-media/msg41227.html [2]: http://gumstix.8.n6.nabble.com/Caspa-Camera-on-2-6-39-Kernel-tp571619p4557013.html [3]: http://processors.wiki.ti.com/index.php/GstTIPlugin_Elements#TIVidenc1 [4]: http://code.google.com/p/gst-dsp/ [5]: http://freedesktop.org/wiki/GstOpenMAX -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] zl10353: change .read_snr() to report SNR as a 0.1 dB
Report SNR in 0.1 dB scale instead of raw hardware register values. Signed-off-by: Antti Palosaari --- drivers/media/dvb/frontends/zl10353.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c index ac72378..23fc853 100644 --- a/drivers/media/dvb/frontends/zl10353.c +++ b/drivers/media/dvb/frontends/zl10353.c @@ -525,7 +525,7 @@ static int zl10353_read_snr(struct dvb_frontend *fe, u16 *snr) zl10353_dump_regs(fe); _snr = zl10353_read_register(state, SNR); - *snr = (_snr << 8) | _snr; + *snr = 10 * _snr / 8; return 0; } -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] V4L: JPEG class documentation corrections
Hi Mauro, I noticed that this patch and V2 that was only intended for merging, are both in media tree now: http://git.linuxtv.org/media_tree.git/history/579e92ffac65c717c9c8a50feb755a035a51bb3f:/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml As a result Table A.58 has a redundant V4L2_CTRL_CLASS_JPEG entry: ... V4L2_CTRL_CLASS_FLASH 0x9cThe class containing flash device controls. These controls are described in the section called “Flash Control Reference”. V4L2_CTRL_CLASS_JPEG0x9dThe class containing JPEG compression controls. These controls are described in the section called “JPEG Control Reference”. V4L2_CTRL_CLASS_IMAGE_SOURCE0x9eThe class containing image source controls. These controls are described in the section called “Image Source Control Reference”. V4L2_CTRL_CLASS_IMAGE_PROC 0x9fThe class containing image processing controls. These controls are described in the section called “Image Process Control Reference”. V4L2_CTRL_CLASS_JPEG0x9dThe class containing JPEG compression controls. These controls are described in the section called “JPEG Control Reference”. Thus I would suggest to revert the older patch - feed0258e11e04b7e0d2df8ae3793ab5d302a035 and remove redundant entry from the end of table. Regards, Sylwester On 03/31/2012 11:43 AM, Sylwester Nawrocki wrote: > This patch fixes following compilation warning: > Error: no ID for constraint linkend: v4l2-jpeg-chroma-subsampling. > > and adds missing JPEG control class at the Table A.58. > > Signed-off-by: Sylwester Nawrocki > --- > Documentation/DocBook/media/v4l/controls.xml |2 +- > .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml |7 +++ > 2 files changed, 8 insertions(+), 1 deletions(-) > > diff --git a/Documentation/DocBook/media/v4l/controls.xml > b/Documentation/DocBook/media/v4l/controls.xml > index 582324f..8761e76 100644 > --- a/Documentation/DocBook/media/v4l/controls.xml > +++ b/Documentation/DocBook/media/v4l/controls.xml > @@ -3546,7 +3546,7 @@ interface and may change in the future. > from RGB to Y'CbCr color space. > > > - > + > > > > diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml > b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml > index b17a7aa..27e20bc 100644 > --- a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml > +++ b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml > @@ -265,7 +265,13 @@ These controls are described in These controls are described in linkend="flash-controls" />. > > + > + V4L2_CTRL_CLASS_JPEG > + 0x9d > + The class containing JPEG compression controls. > +These controls are described in + linkend="jpeg-controls" />. > + > > > > -- > 1.7.4.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [git:v4l-dvb/for_v3.5] [media] media: mx2_camera: Fix mbus format handling
Hi Mauro, Javier
On Tue, 15 May 2012, Mauro Carvalho Chehab wrote:
> This is an automatic generated email to let you know that the following patch
> were queued at the
> http://git.linuxtv.org/media_tree.git tree:
>
> Subject: [media] media: mx2_camera: Fix mbus format handling
> Author: Javier Martin
> Date:Mon Mar 26 09:17:48 2012 -0300
Looks like I have missed this patch, unfortunately, it hasn't been cc'ed
to me. It would have been better to merge it via my soc-camera tree, also
because with this merge window there are a couple more changes, that
affect the generic soc-camera API and the mx2-camera driver in particular.
So far I don't see anything, what could break here, but if something does
- we know who will have to fix it;-)
Thanks
Guennadi
>
> Remove MX2_CAMERA_SWAP16 and MX2_CAMERA_PACK_DIR_MSB flags
> so that the driver can negotiate with the attached sensor
> whether the mbus format needs convertion from UYUV to YUYV
> or not.
>
> Signed-off-by: Javier Martin
> Signed-off-by: Mauro Carvalho Chehab
>
> arch/arm/plat-mxc/include/mach/mx2_cam.h |2 -
> drivers/media/video/mx2_camera.c | 52
> +++---
> 2 files changed, 47 insertions(+), 7 deletions(-)
>
> ---
>
> http://git.linuxtv.org/media_tree.git?a=commitdiff;h=d509835e32bd761a2b7b446034a273da568e5573
>
> diff --git a/arch/arm/plat-mxc/include/mach/mx2_cam.h
> b/arch/arm/plat-mxc/include/mach/mx2_cam.h
> index 3c080a3..7ded6f1 100644
> --- a/arch/arm/plat-mxc/include/mach/mx2_cam.h
> +++ b/arch/arm/plat-mxc/include/mach/mx2_cam.h
> @@ -23,7 +23,6 @@
> #ifndef __MACH_MX2_CAM_H_
> #define __MACH_MX2_CAM_H_
>
> -#define MX2_CAMERA_SWAP16(1 << 0)
> #define MX2_CAMERA_EXT_VSYNC (1 << 1)
> #define MX2_CAMERA_CCIR (1 << 2)
> #define MX2_CAMERA_CCIR_INTERLACE(1 << 3)
> @@ -31,7 +30,6 @@
> #define MX2_CAMERA_GATED_CLOCK (1 << 5)
> #define MX2_CAMERA_INV_DATA (1 << 6)
> #define MX2_CAMERA_PCLK_SAMPLE_RISING(1 << 7)
> -#define MX2_CAMERA_PACK_DIR_MSB (1 << 8)
>
> /**
> * struct mx2_camera_platform_data - optional platform data for mx2_camera
> diff --git a/drivers/media/video/mx2_camera.c
> b/drivers/media/video/mx2_camera.c
> index 18afaee..7c3c0e8 100644
> --- a/drivers/media/video/mx2_camera.c
> +++ b/drivers/media/video/mx2_camera.c
> @@ -344,6 +344,19 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
> PRP_INTR_CH2OVF,
> }
> },
> + {
> + .in_fmt = V4L2_MBUS_FMT_UYVY8_2X8,
> + .out_fmt= V4L2_PIX_FMT_YUV420,
> + .cfg= {
> + .channel= 2,
> + .in_fmt = PRP_CNTL_DATA_IN_YUV422,
> + .out_fmt= PRP_CNTL_CH2_OUT_YUV420,
> + .src_pixel = 0x22000888, /* YUV422 (YUYV) */
> + .irq_flags = PRP_INTR_RDERR | PRP_INTR_CH2WERR |
> + PRP_INTR_CH2FC | PRP_INTR_LBOVF |
> + PRP_INTR_CH2OVF,
> + }
> + },
> };
>
> static struct mx2_fmt_cfg *mx27_emma_prp_get_format(
> @@ -980,6 +993,7 @@ static int mx2_camera_set_bus_param(struct
> soc_camera_device *icd)
> struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
> struct mx2_camera_dev *pcdev = ici->priv;
> struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
> + const struct soc_camera_format_xlate *xlate;
> unsigned long common_flags;
> int ret;
> int bytesperline;
> @@ -1024,14 +1038,31 @@ static int mx2_camera_set_bus_param(struct
> soc_camera_device *icd)
> return ret;
> }
>
> + xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
> + if (!xlate) {
> + dev_warn(icd->parent, "Format %x not found\n", pixfmt);
> + return -EINVAL;
> + }
> +
> + if (xlate->code == V4L2_MBUS_FMT_YUYV8_2X8) {
> + csicr1 |= CSICR1_PACK_DIR;
> + csicr1 &= ~CSICR1_SWAP16_EN;
> + dev_dbg(icd->parent, "already yuyv format, don't convert\n");
> + } else if (xlate->code == V4L2_MBUS_FMT_UYVY8_2X8) {
> + csicr1 &= ~CSICR1_PACK_DIR;
> + csicr1 |= CSICR1_SWAP16_EN;
> + dev_dbg(icd->parent, "convert uyvy mbus format into yuyv\n");
> + } else {
> + dev_warn(icd->parent, "mbus format not supported\n");
> + return -EINVAL;
> + }
> +
> if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
> csicr1 |= CSICR1_REDGE;
> if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
> csicr1 |= CSICR1_SOF_POL;
> if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
> csicr1 |= CSICR1_HSYNC_POL;
> - if (pcdev->platform_flags & MX2_CAMERA_SWAP16)
> - csicr1 |= CSICR1_SWAP16_EN
[PATCH] rtl2830: implement .read_snr()
Reports value as a 0.1 dB.
Signed-off-by: Antti Palosaari
---
drivers/media/dvb/frontends/rtl2830.c | 42 +++-
drivers/media/dvb/frontends/rtl2830_priv.h |1 +
2 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/drivers/media/dvb/frontends/rtl2830.c
b/drivers/media/dvb/frontends/rtl2830.c
index 45196c5..bd18dbe 100644
--- a/drivers/media/dvb/frontends/rtl2830.c
+++ b/drivers/media/dvb/frontends/rtl2830.c
@@ -404,8 +404,48 @@ err:
static int rtl2830_read_snr(struct dvb_frontend *fe, u16 *snr)
{
- *snr = 0;
+ struct rtl2830_priv *priv = fe->demodulator_priv;
+ int ret, hierarchy, constellation;
+ u8 buf[2], tmp;
+ u16 tmp16;
+#define CONSTELLATION_NUM 3
+#define HIERARCHY_NUM 4
+ static const u32 snr_constant[CONSTELLATION_NUM][HIERARCHY_NUM] = {
+ { 70705899, 70705899, 70705899, 70705899 },
+ { 82433173, 82433173, 87483115, 94445660 },
+ { 92888734, 92888734, 95487525, 99770748 },
+ };
+
+ /* reports SNR in resolution of 0.1 dB */
+
+ ret = rtl2830_rd_reg(priv, 0x33c, &tmp);
+ if (ret)
+ goto err;
+
+ constellation = (tmp >> 2) & 0x03; /* [3:2] */
+ if (constellation > CONSTELLATION_NUM - 1)
+ goto err;
+
+ hierarchy = (tmp >> 4) & 0x03; /* [5:4] */
+ if (hierarchy > HIERARCHY_NUM - 1)
+ goto err;
+
+ ret = rtl2830_rd_regs(priv, 0x40c, buf, 2);
+ if (ret)
+ goto err;
+
+ tmp16 = buf[0] << 8 | buf[1];
+
+ if (tmp16)
+ *snr = (snr_constant[constellation][hierarchy] -
+ intlog10(tmp16)) / ((1 << 24) / 100);
+ else
+ *snr = 0;
+
return 0;
+err:
+ dbg("%s: failed=%d", __func__, ret);
+ return ret;
}
static int rtl2830_read_ber(struct dvb_frontend *fe, u32 *ber)
diff --git a/drivers/media/dvb/frontends/rtl2830_priv.h
b/drivers/media/dvb/frontends/rtl2830_priv.h
index 4a46476..9b20557 100644
--- a/drivers/media/dvb/frontends/rtl2830_priv.h
+++ b/drivers/media/dvb/frontends/rtl2830_priv.h
@@ -22,6 +22,7 @@
#define RTL2830_PRIV_H
#include "dvb_frontend.h"
+#include "dvb_math.h"
#include "rtl2830.h"
#define LOG_PREFIX "rtl2830"
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2] V4L: DocBook: Improve V4L2_CID_AUTO_N_WHITE_BALANCE control description
This patch removes the estimate color temperature range specification for the white balance presets for which exact values heavily depend on a particular camera specification. Signed-off-by: Sylwester Nawrocki --- Fixed typo in the patch summary line. Documentation/DocBook/media/v4l/controls.xml | 14 +- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 8994132..2ed82ee 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml @@ -3174,8 +3174,7 @@ color temperature range. V4L2_WHITE_BALANCE_FLUORESCENT - White balance preset for fluorescent lighting. -It corresponds approximately to 4000...5000 K color temperature. + White balance preset for fluorescent lighting. V4L2_WHITE_BALANCE_FLUORESCENT_H @@ -3184,19 +3183,17 @@ fluorescent H lighting. V4L2_WHITE_BALANCE_HORIZON - White balance setting for horizon daylight. -It corresponds approximately to 5000 K color temperature. + White balance setting for horizon daylight. V4L2_WHITE_BALANCE_DAYLIGHT - White balance preset for daylight (with clear sky). + White balance preset for clear-sky daylight. It corresponds approximately to 5000...6500 K color temperature. V4L2_WHITE_BALANCE_FLASH With this setting the camera will compensate for the flash -light. It slightly warms up the colors and corresponds roughly to 5000...5500 K -color temperature. +light. V4L2_WHITE_BALANCE_CLOUDY @@ -3207,8 +3204,7 @@ range. V4L2_WHITE_BALANCE_SHADE White balance preset for shade or heavily overcast -sky. It corresponds approximately to 9000...1 K color temperature. - +sky. -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] V4L: DocBook: Improve V4L2_AUTO_N_WHITE_BALANCE control description
This patch removes the estimate color temperature range specification for white balance presets for which exact values heavily depend on a particular camera specification. Signed-off-by: Sylwester Nawrocki --- Documentation/DocBook/media/v4l/controls.xml | 12 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 8994132..1cef967 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml @@ -3174,8 +3174,7 @@ color temperature range. V4L2_WHITE_BALANCE_FLUORESCENT - White balance preset for fluorescent lighting. -It corresponds approximately to 4000...5000 K color temperature. + White balance preset for fluorescent lighting. V4L2_WHITE_BALANCE_FLUORESCENT_H @@ -3184,8 +3183,7 @@ fluorescent H lighting. V4L2_WHITE_BALANCE_HORIZON - White balance setting for horizon daylight. -It corresponds approximately to 5000 K color temperature. + White balance setting for horizon daylight. V4L2_WHITE_BALANCE_DAYLIGHT @@ -3195,8 +3193,7 @@ It corresponds approximately to 5000...6500 K color temperature. V4L2_WHITE_BALANCE_FLASH With this setting the camera will compensate for the flash -light. It slightly warms up the colors and corresponds roughly to 5000...5500 K -color temperature. +light. V4L2_WHITE_BALANCE_CLOUDY @@ -3207,9 +3204,7 @@ range. V4L2_WHITE_BALANCE_SHADE White balance preset for shade or heavily overcast -sky. It corresponds approximately to 9000...1 K color temperature. - +sky. -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] renamings and librarization
---
lib/include/dvb-fe.h |4 ++--
lib/include/dvb-file.h | 12 ++--
lib/include/dvb-frontend.h |2 +-
lib/include/libsat.h | 27 +--
lib/libdvbv5/dvb-file.c|2 +-
lib/libdvbv5/libsat.c | 20 +++-
utils/dvb/dvb-format-convert.c |2 +-
utils/dvb/dvbv5-scan.c |8
utils/dvb/dvbv5-zap.c |2 +-
9 files changed, 56 insertions(+), 23 deletions(-)
diff --git a/lib/include/dvb-fe.h b/lib/include/dvb-fe.h
index 5150ebf..dbcd720 100644
--- a/lib/include/dvb-fe.h
+++ b/lib/include/dvb-fe.h
@@ -74,12 +74,12 @@ struct dvb_v5_fe_parms {
struct dvb_v5_stats stats;
/* Satellite specific stuff, specified by the library client */
- struct dvb_satellite_lnb*lnb;
+ struct dvbsat_lnb *lnb;
int sat_number;
unsignedfreq_bpf;
/* Satellite specific stuff, used internally */
- enum polarization pol;
+ enum dvbsat_polarizationpol;
int high_band;
unsigneddiseqc_wait;
unsignedfreq_offset;
diff --git a/lib/include/dvb-file.h b/lib/include/dvb-file.h
index 7e0803e..ed74eef 100644
--- a/lib/include/dvb-file.h
+++ b/lib/include/dvb-file.h
@@ -34,7 +34,7 @@ struct dvb_entry {
char *location;
- enum polarization pol;
+ enum dvbsat_polarization pol;
int sat_number;
unsigned freq_bpf;
unsigned diseqc_wait;
@@ -91,6 +91,10 @@ enum file_formats {
struct dvb_descriptors;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
static inline void dvb_file_free(struct dvb_file *dvb_file)
{
struct dvb_entry *entry = dvb_file->first_entry, *next;
@@ -145,10 +149,14 @@ int store_dvb_channel(struct dvb_file **dvb_file,
int get_detected, int get_nit);
int parse_delsys(const char *name);
enum file_formats parse_format(const char *name);
-struct dvb_file *read_file_format(const char *fname,
+struct dvb_file *dvb_read_file_format(const char *fname,
uint32_t delsys,
enum file_formats format);
int write_file_format(const char *fname,
struct dvb_file *dvb_file,
uint32_t delsys,
enum file_formats format);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/include/dvb-frontend.h b/lib/include/dvb-frontend.h
index 7e7cb64..3ccaf24 100644
--- a/lib/include/dvb-frontend.h
+++ b/lib/include/dvb-frontend.h
@@ -328,7 +328,7 @@ typedef enum fe_pilot {
PILOT_AUTO,
} fe_pilot_t;
-typedef enum fe_rolloff {
+typedef enum fe_rolloff { // FIXME: move to libsat.h ?
ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */
ROLLOFF_20,
ROLLOFF_25,
diff --git a/lib/include/libsat.h b/lib/include/libsat.h
index cb78cbb..690fe61 100644
--- a/lib/include/libsat.h
+++ b/lib/include/libsat.h
@@ -17,7 +17,10 @@
* Or, point your browser to
http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
-enum polarization {
+#ifndef _libsat_
+#define _libsat_
+
+enum dvbsat_polarization {
POLARIZATION_OFF= 0,
POLARIZATION_H = 1,
POLARIZATION_V = 2,
@@ -25,26 +28,38 @@ enum polarization {
POLARIZATION_R = 4,
};
-struct dvb_satellite_freqrange {
+struct dvbsat_freqrange {
unsigned low, high;
};
-struct dvb_satellite_lnb {
+struct dvbsat_lnb {
char *name;
char *alias;
unsigned lowfreq, highfreq;
unsigned rangeswitch;
- struct dvb_satellite_freqrange freqrange[2];
+ struct dvbsat_freqrange freqrange[2];
};
-struct dvb_v5_fe_parms *parms;
+struct dvb_v5_fe_parms;
+
+extern const char *dvbsat_polarization_name[5];
+
+#ifdef __cplusplus
+extern "C" {
+#endif
/* From libsat.c */
int search_lnb(char *name);
int print_lnb(int i);
void print_all_lnb(void);
-struct dvb_satellite_lnb *get_lnb(int i);
+struct dvbsat_lnb *get_lnb(int i);
int dvb_satellite_set_parms(struct dvb_v5_fe_parms *parms);
int dvb_satellite_get_parms(struct dvb_v5_fe_parms *parms);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/lib/libdvbv5/dvb-file.c b/lib/libdvbv5/dvb-file.c
index e1f2195..b54c049 100644
--- a/lib/libdvbv5/dvb-file.c
+++ b/lib/libdvbv5/dvb-file.c
@@ -1077,7 +1077,7 @@ int parse_delsys(const char *name)
return -1;
}
-struct dvb_file *read_file_format(const char *fname,
+struct dvb_file *dvb_read_file_format(const char *fname,
uint32_t delsys,
enum file_formats format)
{
diff --git a/lib/libdvbv5/libsat.c b/lib/libdvbv5/libsat.c
index d155686..253e92e 100644
--- a/lib/libdvbv5/libsat.c
+++ b/lib/libdvbv5/
Re: [PATCH 03/23] V4L: Add an extended camera white balance control
Hi Sakari, On 05/14/2012 02:02 AM, Sakari Ailus wrote: > Hi Sylwester, > > Thanks for the patch. I noticed your pull req; I hope you could take into > account a few more comments. :) Thank you for your comments, I'll try to come up with a fix up patch. > On Thu, May 10, 2012 at 12:30:38PM +0200, Sylwester Nawrocki wrote: >> This patch adds V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE control which is >> an extended version of the V4L2_CID_AUTO_WHITE_BALANCE control, >> including white balance presets. The following presets are defined: >> >> - V4L2_WHITE_BALANCE_INCANDESCENT, >> - V4L2_WHITE_BALANCE_FLUORESCENT, >> - V4L2_WHITE_BALANCE_FLUORESCENT_H, >> - V4L2_WHITE_BALANCE_HORIZON, >> - V4L2_WHITE_BALANCE_DAYLIGHT, >> - V4L2_WHITE_BALANCE_FLASH, >> - V4L2_WHITE_BALANCE_CLOUDY, >> - V4L2_WHITE_BALANCE_SHADE. >> >> Signed-off-by: HeungJun Kim >> Signed-off-by: Sylwester Nawrocki >> Signed-off-by: Kyungmin Park >> Acked-by: Hans de Goede >> --- >> Documentation/DocBook/media/v4l/controls.xml | 70 >> ++ >> drivers/media/video/v4l2-ctrls.c | 17 +++ >> include/linux/videodev2.h| 14 ++ >> 3 files changed, 101 insertions(+) >> >> diff --git a/Documentation/DocBook/media/v4l/controls.xml >> b/Documentation/DocBook/media/v4l/controls.xml >> index 40e6485..85d1ca0 100644 >> --- a/Documentation/DocBook/media/v4l/controls.xml >> +++ b/Documentation/DocBook/media/v4l/controls.xml >> @@ -3022,6 +3022,76 @@ camera sensor on or off, or specify its strength. >> Such band-stop filters can >> be used, for example, to filter out the fluorescent light >> component. >> >> >> + >> + >> +> spanname="id">V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE >> +enum v4l2_auto_n_preset_white_balance >> +Sets white balance to automatic, >> +manual or a preset. The presets determine color temperature of the light as >> +a hint to the camera for white balance adjustments resulting in most >> accurate >> +color representation. The following white balance presets are listed in >> order >> +of increasing color temperature. >> + >> + >> + >> + >> + >> + >> V4L2_WHITE_BALANCE_MANUAL >> +Manual white balance. >> + >> + >> + >> V4L2_WHITE_BALANCE_AUTO >> +Automatic white balance adjustments. >> + >> + >> + >> V4L2_WHITE_BALANCE_INCANDESCENT >> +White balance setting for incandescent (tungsten) >> lighting. >> +It generally cools down the colors and corresponds approximately to >> 2500...3500 K >> +color temperature range. >> + >> + >> + >> V4L2_WHITE_BALANCE_FLUORESCENT >> +White balance preset for fluorescent lighting. >> +It corresponds approximately to 4000...5000 K color temperature. >> + >> + >> + >> V4L2_WHITE_BALANCE_FLUORESCENT_H >> +With this setting the camera will compensate for >> +fluorescent H lighting. >> + > > I don't remember for quite sure if I replied to this already... what's the > diff between the above two? No, you didn't, otherwise I would certainly remember that ;) V4L2_WHITE_BALANCE_FLUORESCENT_H is for newer, daylight calibrated fluorescent lamps. So this preset will generally cool down the colours less than V4L2_WHITE_BALANCE_FLUORESCENT. I was even thinking about a separate control for V4L2_WHITE_BALANCE_FLUORESCENT, since some ISPs have several presets for fluorescent lighting. I dropped that idea finally though. > The colour temperature of the fluorescent light depends on the lamp; 2500 K > is not uncommon here in Finland. It's the spectrum that's different from > incandescents, not necessarily the colour temperature. > >> + >> + >> V4L2_WHITE_BALANCE_HORIZON >> +White balance setting for horizon daylight. >> +It corresponds approximately to 5000 K color temperature. >> + >> + >> + >> V4L2_WHITE_BALANCE_DAYLIGHT >> +White balance preset for daylight (with clear sky). >> +It corresponds approximately to 5000...6500 K color temperature. >> + >> + >> + >> V4L2_WHITE_BALANCE_FLASH >> +With this setting the camera will compensate for the >> flash >> +light. It slightly warms up the colors and corresponds roughly to >> 5000...5500 K >> +color temperature. > > This also depends heavily on the type of the flash. OK, I'm going to remove this one, and for V4L2_WHITE_BALANCE_FLUORESCENT as well. I would prefer to keep the remaining ones though. > I'd just remove the colour temperature from most of these since it looks > more like assumptions made in a particular system rather than something > generic. The colour temperature ranges are mostly rough estimates to give an overview of what these presets are. I compar
Re: [PATCH] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)
Acked-by: Márton Németh
Jozsef Marton wrote:
> From: Jozsef Marton
>
> gspca_pac7302 module supports the webcam with usb id: 093a:2627.
> It is a Genius FaceCam 300.
> The module does not need any changes but listing the usb id along with a
> vertical flip flag.
> The included patch adds this to the module source.
>
> Signed-off-by: Jozsef Marton
> ---
> diff -uprN -X dontdiff
> linux-3.4-rc7-vanilla/Documentation/video4linux/gspca.txt
> linux-3.4-rc7/Documentation/video4linux/gspca.txt
> --- linux-3.4-rc7-vanilla/Documentation/video4linux/gspca.txt 2012-05-13
> 03:37:47.0 +0200
> +++ linux-3.4-rc7/Documentation/video4linux/gspca.txt 2012-05-15
> 16:56:55.603514846 +0200
> @@ -276,6 +276,7 @@ pac7302 093a:2622 Genius Eye 312
> pac7302 093a:2624 PAC7302
> pac7302 093a:2625 Genius iSlim 310
> pac7302 093a:2626 Labtec 2200
> +pac7302 093a:2627 Genius FaceCam 300
> pac7302 093a:2628 Genius iLook 300
> pac7302 093a:2629 Genious iSlim 300
> pac7302 093a:262a Webcam 300k
> diff -uprN -X dontdiff
> linux-3.4-rc7-vanilla/drivers/media/video/gspca/pac7302.c
> linux-3.4-rc7/drivers/media/video/gspca/pac7302.c
> --- linux-3.4-rc7-vanilla/drivers/media/video/gspca/pac7302.c 2012-05-13
> 03:37:47.0 +0200
> +++ linux-3.4-rc7/drivers/media/video/gspca/pac7302.c 2012-05-15
> 15:15:03.355624405 +0200
> @@ -940,6 +940,7 @@ static const struct usb_device_id device
> {USB_DEVICE(0x093a, 0x2624), .driver_info = FL_VFLIP},
> {USB_DEVICE(0x093a, 0x2625)},
> {USB_DEVICE(0x093a, 0x2626)},
> + {USB_DEVICE(0x093a, 0x2627), .driver_info = FL_VFLIP},
> {USB_DEVICE(0x093a, 0x2628)},
> {USB_DEVICE(0x093a, 0x2629), .driver_info = FL_VFLIP},
> {USB_DEVICE(0x093a, 0x262a)},
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] V4L: DocBook: Corrected focus control documentation
Remove documentation chunk of not existent V4L2_CID_AUTO_FOCUS_AREA control. It fixes following build error: Error: no ID for constraint linkend: v4l2-auto-focus-area. Signed-off-by: Sylwester Nawrocki --- Documentation/DocBook/media/v4l/compat.xml |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index dc61b01..b98f3bf 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml @@ -2570,9 +2570,5 @@ ioctls. Sub-device selection API: &VIDIOC-SUBDEV-G-SELECTION; and &VIDIOC-SUBDEV-S-SELECTION; ioctls. - - - V4L2_CID_AUTO_FOCUS_AREA control. - -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL FOR v3.5] Rebased version of the new Timings API
Hi, On 05/15/2012 01:20 PM, Hans Verkuil wrote: Hi Mauro, Rebased as there were some conflicts after all the recent changes. Also tested DocBook, works fine for me. Note that I get this: Error: no ID for constraint linkend: v4l2-auto-focus-area. Something missing in those focus control patches. These are leftovers from V4L2_CID_AUTO_FOCUS_AREA control. I missed to remove one chunk from Documentation/DocBook/media/v4l/compat.xml while rebasing the patches. To follow a patch rectifying that issue. Sorry about that omission. Regards, Sylwester -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] mmp-camera: specify XO-1.75 clock speed
For the ov7670 camera to return images at the requested frame rate, it needs to make calculations based on the clock speed, which is a completely external factor (depends on the wiring of the system). On the XO-1.75, which is the only known mmp-camera user, the camera is clocked at 48MHz. Pass this information to the ov7670 driver, to fix an issue where a framerate faster than the requested amount was being provided. Signed-off-by: Daniel Drake --- drivers/media/video/marvell-ccic/mmp-driver.c |7 +++ 1 file changed, 7 insertions(+) Jon, is it OK to assume that XO-1.75 is the only mmp-camera user? diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c index c4c17fe..0ba49c7 100644 --- a/drivers/media/video/marvell-ccic/mmp-driver.c +++ b/drivers/media/video/marvell-ccic/mmp-driver.c @@ -188,6 +188,13 @@ static int mmpcam_probe(struct platform_device *pdev) mcam->chip_id = V4L2_IDENT_ARMADA610; mcam->buffer_mode = B_DMA_sg; spin_lock_init(&mcam->dev_lock); + + /* +* Set the clock speed for the XO-1.75; I don't believe this +* driver has ever run anywhere else. +*/ + mcam->clock_speed = 48; + /* * Get our I/O memory. */ -- 1.7.10.1 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
cron job: media_tree daily build: ERRORS
This message is generated daily by a cron job that builds media_tree for the kernels and architectures in the list below. Results of the daily build of media_tree: date:Tue May 15 19:00:23 CEST 2012 git hash:b89225a1c803d50271f86be15ecfccc0b0215007 gcc version: i686-linux-gcc (GCC) 4.6.3 host hardware:x86_64 host os: 3.3-5.slh.3-amd64 linux-git-arm-eabi-exynos: ERRORS linux-git-arm-eabi-omap: ERRORS linux-git-armv5-ixp: WARNINGS linux-git-i686: WARNINGS linux-git-m32r: ERRORS linux-git-mips: WARNINGS linux-git-powerpc64: WARNINGS linux-git-x86_64: WARNINGS linux-2.6.31.12-i686: ERRORS linux-2.6.32.6-i686: ERRORS linux-2.6.33-i686: ERRORS linux-2.6.34-i686: WARNINGS linux-2.6.35.3-i686: WARNINGS linux-2.6.36-i686: WARNINGS linux-2.6.37-i686: WARNINGS linux-2.6.38.2-i686: WARNINGS linux-2.6.39.1-i686: WARNINGS linux-3.0-i686: WARNINGS linux-3.1-i686: WARNINGS linux-3.2.1-i686: WARNINGS linux-3.3-i686: WARNINGS linux-2.6.31.12-x86_64: ERRORS linux-2.6.32.6-x86_64: ERRORS linux-2.6.33-x86_64: ERRORS linux-2.6.34-x86_64: WARNINGS linux-2.6.35.3-x86_64: WARNINGS linux-2.6.36-x86_64: WARNINGS linux-2.6.37-x86_64: WARNINGS linux-2.6.38.2-x86_64: WARNINGS linux-2.6.39.1-x86_64: WARNINGS linux-3.0-x86_64: WARNINGS linux-3.1-x86_64: WARNINGS linux-3.2.1-x86_64: WARNINGS linux-3.3-x86_64: WARNINGS apps: WARNINGS spec-git: WARNINGS sparse: ERRORS Detailed results are available here: http://www.xs4all.nl/~hverkuil/logs/Tuesday.log Full logs are available here: http://www.xs4all.nl/~hverkuil/logs/Tuesday.tar.bz2 The V4L-DVB specification from this daily build is here: http://www.xs4all.nl/~hverkuil/spec/media.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)
From: Jozsef Marton
gspca_pac7302 module supports the webcam with usb id: 093a:2627.
It is a Genius FaceCam 300.
The module does not need any changes but listing the usb id along with a
vertical flip flag.
The included patch adds this to the module source.
Signed-off-by: Jozsef Marton
---
diff -uprN -X dontdiff
linux-3.4-rc7-vanilla/Documentation/video4linux/gspca.txt
linux-3.4-rc7/Documentation/video4linux/gspca.txt
--- linux-3.4-rc7-vanilla/Documentation/video4linux/gspca.txt 2012-05-13
03:37:47.0 +0200
+++ linux-3.4-rc7/Documentation/video4linux/gspca.txt 2012-05-15
16:56:55.603514846 +0200
@@ -276,6 +276,7 @@ pac7302 093a:2622 Genius Eye 312
pac7302093a:2624 PAC7302
pac7302093a:2625 Genius iSlim 310
pac7302093a:2626 Labtec 2200
+pac7302093a:2627 Genius FaceCam 300
pac7302093a:2628 Genius iLook 300
pac7302093a:2629 Genious iSlim 300
pac7302093a:262a Webcam 300k
diff -uprN -X dontdiff
linux-3.4-rc7-vanilla/drivers/media/video/gspca/pac7302.c
linux-3.4-rc7/drivers/media/video/gspca/pac7302.c
--- linux-3.4-rc7-vanilla/drivers/media/video/gspca/pac7302.c 2012-05-13
03:37:47.0 +0200
+++ linux-3.4-rc7/drivers/media/video/gspca/pac7302.c 2012-05-15
15:15:03.355624405 +0200
@@ -940,6 +940,7 @@ static const struct usb_device_id device
{USB_DEVICE(0x093a, 0x2624), .driver_info = FL_VFLIP},
{USB_DEVICE(0x093a, 0x2625)},
{USB_DEVICE(0x093a, 0x2626)},
+ {USB_DEVICE(0x093a, 0x2627), .driver_info = FL_VFLIP},
{USB_DEVICE(0x093a, 0x2628)},
{USB_DEVICE(0x093a, 0x2629), .driver_info = FL_VFLIP},
{USB_DEVICE(0x093a, 0x262a)},
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL FOR 3.5] DMABUF importer feature in V4L2 API
Hi Mauro, The following patch series adds DMABUF importer role to V4L2 API. I'm sending this on behalf of Tomasz Stanislawski. Please pull for v3.5. The following changes since commit d509835e32bd761a2b7b446034a273da568e5573: [media] media: mx2_camera: Fix mbus format handling (2012-05-15 09:42:17 -0300) are available in the git repository at: git://git.infradead.org/users/kmpark/linux-samsung v4l2_dmabuf for you to fetch changes up to ac768fa8ad56774b0084dccb727b515e23e467cd: v4l: s5p-fimc: support for dmabuf importing (2012-05-15 15:46:49 +0200) Andrzej Pietrasiewicz (1): v4l: vb2-dma-contig: add support for scatterlist in userptr mode Laurent Pinchart (2): v4l: vb2-dma-contig: Shorten vb2_dma_contig prefix to vb2_dc v4l: vb2-dma-contig: Reorder functions Marek Szyprowski (2): v4l: vb2: add prepare/finish callbacks to allocators v4l: vb2-dma-contig: add prepare/finish to dma-contig allocator Sumit Semwal (4): v4l: Add DMABUF as a memory type v4l: vb2: add support for shared buffer (dma_buf) v4l: vb: remove warnings about MEMORY_DMABUF v4l: vb2-dma-contig: add support for dma_buf importing Tomasz Stanislawski (4): Documentation: media: description of DMABUF importing in V4L2 v4l: vb2-dma-contig: Remove unneeded allocation context structure v4l: s5p-tv: mixer: support for dmabuf importing v4l: s5p-fimc: support for dmabuf importing Documentation/DocBook/media/v4l/compat.xml |4 + Documentation/DocBook/media/v4l/io.xml | 179 +++ Documentation/DocBook/media/v4l/vidioc-create-bufs.xml |1 + Documentation/DocBook/media/v4l/vidioc-qbuf.xml| 15 +++ Documentation/DocBook/media/v4l/vidioc-reqbufs.xml | 45 drivers/media/video/Kconfig|1 + drivers/media/video/s5p-fimc/fimc-capture.c|2 +- drivers/media/video/s5p-tv/Kconfig |1 + drivers/media/video/s5p-tv/mixer_video.c |2 +- drivers/media/video/videobuf-core.c|4 + drivers/media/video/videobuf2-core.c | 207 +++- drivers/media/video/videobuf2-dma-contig.c | 518 - include/linux/videodev2.h |7 ++ include/media/videobuf2-core.h | 34 ++ 14 files changed, 921 insertions(+), 99 deletions(-) -- Regards, Sylwester -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL FOR 3.5] s5p-fimc driver updates
Hi Mauro, On 05/14/2012 11:39 PM, Sylwester Nawrocki wrote: > On 05/10/2012 10:48 AM, Sylwester Nawrocki wrote: >> On 05/04/2012 05:31 PM, Sylwester Nawrocki wrote: ... >> Mauro, >> >> I've found a few issues in this series afterwards and re-edited 3 commits >> there. >> Here is an updated pull request: >> >> The following changes since commit ae45d3e9aea0ab951dbbca2238fbfbf3993f1e7f: >> >>s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS (2012-05-09 >> 16:07:49 +0200) >> >> are available in the git repository at: >> >>git://git.infradead.org/users/kmpark/linux-samsung v4l-fimc-exynos4x12 >> >> for you to fetch changes up to 5feefe6656583de6fd4ef1d53b19031dd5efeec1: >> >>s5p-fimc: Use selection API in place of crop operations (2012-05-09 >> 16:11:29 +0200) >> >> >> Sylwester Nawrocki (14): >>V4L: Extend V4L2_CID_COLORFX with more image effects >>s5p-fimc: Avoid crash with null platform_data >>s5p-fimc: Move m2m node driver into separate file > > It seems there is a conflict now with this patch: > http://git.linuxtv.org/media_tree.git/commit/5126f2590bee412e3053de851cb07f531e4be36a > > Attached are updated versions of the two conflicting patches, the others > don't need touching. > > I could provide rebased version of the whole change set tomorrow - if needed. Here comes the updated change set: The following changes since commit 152a3a7320d1582009db85d8be365ce430d079af: [media] v4l2-dev: rename two functions (2012-05-14 15:06:50 -0300) are available in the git repository at: git://git.infradead.org/users/kmpark/linux-samsung v4l-fimc-exynos4x12 for you to fetch changes up to 7df337fdecb908d6b7762b0b6d9160a911d0cafe: s5p-fimc: Use selection API in place of crop operations (2012-05-15 11:02:53 +0200) Sylwester Nawrocki (14): s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS s5p-fimc: Avoid crash with null platform_data s5p-fimc: Move m2m node driver into separate file s5p-fimc: Use v4l2_subdev internal ops to register video nodes s5p-fimc: Refactor the register interface functions s5p-fimc: Add FIMC-LITE register definitions s5p-fimc: Rework the video pipeline control functions s5p-fimc: Prefix format enumerations with FIMC_FMT_ s5p-fimc: Minor cleanups s5p-fimc: Make sure an interrupt is properly requested s5p-fimc: Add support for Exynos4x12 FIMC-LITE s5p-fimc: Update copyright notices s5p-fimc: Add color effect control s5p-fimc: Use selection API in place of crop operations drivers/media/video/Kconfig | 24 +- drivers/media/video/s5p-fimc/Kconfig | 48 +++ drivers/media/video/s5p-fimc/Makefile|6 +- drivers/media/video/s5p-fimc/fimc-capture.c | 500 drivers/media/video/s5p-fimc/fimc-core.c | 1109 +++-- drivers/media/video/s5p-fimc/fimc-core.h | 256 +--- drivers/media/video/s5p-fimc/fimc-lite-reg.c | 300 +++ drivers/media/video/s5p-fimc/fimc-lite-reg.h | 150 ++ drivers/media/video/s5p-fimc/fimc-lite.c | 1576 +++ drivers/media/video/s5p-fimc/fimc-lite.h | 213 ++ drivers/media/video/s5p-fimc/fimc-m2m.c | 824 drivers/media/video/s5p-fimc/fimc-mdevice.c | 407 +- drivers/media/video/s5p-fimc/fimc-mdevice.h | 18 +- drivers/media/video/s5p-fimc/fimc-reg.c | 613 +-- drivers/media/video/s5p-fimc/fimc-reg.h | 326 + drivers/media/video/s5p-fimc/regs-fimc.h | 301 --- include/media/s5p_fimc.h | 16 + 17 files changed, 4635 insertions(+), 2052 deletions(-) create mode 100644 drivers/media/video/s5p-fimc/Kconfig create mode 100644 drivers/media/video/s5p-fimc/fimc-lite-reg.c create mode 100644 drivers/media/video/s5p-fimc/fimc-lite-reg.h create mode 100644 drivers/media/video/s5p-fimc/fimc-lite.c create mode 100644 drivers/media/video/s5p-fimc/fimc-lite.h create mode 100644 drivers/media/video/s5p-fimc/fimc-m2m.c create mode 100644 drivers/media/video/s5p-fimc/fimc-reg.h delete mode 100644 drivers/media/video/s5p-fimc/regs-fimc.h -- Regards, Sylwester -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5] rtl2832 ver 0.3: suport for RTL2832 demodulator revised version
On 14.05.2012 04:37, Antti Palosaari wrote: On 12.05.2012 21:08, Thomas Mair wrote: Changes compared to version 0.2: +++ b/drivers/media/dvb/frontends/Makefile @@ -98,6 +98,7 @@ obj-$(CONFIG_DVB_IT913X_FE) += it913x-fe.o obj-$(CONFIG_DVB_A8293) += a8293.o obj-$(CONFIG_DVB_TDA10071) += tda10071.o obj-$(CONFIG_DVB_RTL2830) += rtl2830.o +obj-$(CONFIG_DVB_RTL2832) = rtl2832.o obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o obj-$(CONFIG_DVB_AF9033) += af9033.o I just realized that very bad bug! That prevents compilation of all the other demods than rtl2832. regards Antti -- http://palosaari.fi/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] smiapp: Remove smiapp-debug.h in favour of dynamic debug
Remove smiapp-debug.h and let people use CONFIG_DYNAMIC_DEBUG instead. The option only affected to when debug information was being printed. Signed-off-by: Sakari Ailus --- drivers/media/video/smiapp-pll.c |2 - drivers/media/video/smiapp/Kconfig|7 -- drivers/media/video/smiapp/smiapp-core.c |2 - drivers/media/video/smiapp/smiapp-debug.h | 32 - drivers/media/video/smiapp/smiapp-quirk.c |2 - drivers/media/video/smiapp/smiapp-regs.c |2 - 6 files changed, 0 insertions(+), 47 deletions(-) delete mode 100644 drivers/media/video/smiapp/smiapp-debug.h diff --git a/drivers/media/video/smiapp-pll.c b/drivers/media/video/smiapp-pll.c index 501da41..a416e27 100644 --- a/drivers/media/video/smiapp-pll.c +++ b/drivers/media/video/smiapp-pll.c @@ -22,8 +22,6 @@ * */ -#include "smiapp/smiapp-debug.h" - #include #include #include diff --git a/drivers/media/video/smiapp/Kconfig b/drivers/media/video/smiapp/Kconfig index 9504c43..f7b35ff 100644 --- a/drivers/media/video/smiapp/Kconfig +++ b/drivers/media/video/smiapp/Kconfig @@ -4,10 +4,3 @@ config VIDEO_SMIAPP select VIDEO_SMIAPP_PLL ---help--- This is a generic driver for SMIA++/SMIA camera modules. - -config VIDEO_SMIAPP_DEBUG - bool "Enable debugging for the generic SMIA++/SMIA driver" - depends on VIDEO_SMIAPP - ---help--- - Enable debugging output in the generic SMIA++/SMIA driver. If you - are developing the driver you might want to enable this. diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c index 3991c45..a8a1db9 100644 --- a/drivers/media/video/smiapp/smiapp-core.c +++ b/drivers/media/video/smiapp/smiapp-core.c @@ -26,8 +26,6 @@ * */ -#include "smiapp-debug.h" - #include #include #include diff --git a/drivers/media/video/smiapp/smiapp-debug.h b/drivers/media/video/smiapp/smiapp-debug.h deleted file mode 100644 index 627809e..000 --- a/drivers/media/video/smiapp/smiapp-debug.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * drivers/media/video/smiapp/smiapp-debug.h - * - * Generic driver for SMIA/SMIA++ compliant camera modules - * - * Copyright (C) 2011--2012 Nokia Corporation - * Contact: Sakari Ailus - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - -#ifndef SMIAPP_DEBUG_H -#define SMIAPP_DEBUG_H - -#ifdef CONFIG_VIDEO_SMIAPP_DEBUG -#define DEBUG -#endif - -#endif diff --git a/drivers/media/video/smiapp/smiapp-quirk.c b/drivers/media/video/smiapp/smiapp-quirk.c index dae85a1..fb018de 100644 --- a/drivers/media/video/smiapp/smiapp-quirk.c +++ b/drivers/media/video/smiapp/smiapp-quirk.c @@ -22,8 +22,6 @@ * */ -#include "smiapp-debug.h" - #include #include "smiapp.h" diff --git a/drivers/media/video/smiapp/smiapp-regs.c b/drivers/media/video/smiapp/smiapp-regs.c index 4851ff7..a5055f1 100644 --- a/drivers/media/video/smiapp/smiapp-regs.c +++ b/drivers/media/video/smiapp/smiapp-regs.c @@ -22,8 +22,6 @@ * */ -#include "smiapp-debug.h" - #include #include -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] media_build: add fixp-arith.h in linux/include/linux
Em 15-05-2012 11:25, Antonio Ospite escreveu: > On Tue, 15 May 2012 15:35:15 +0200 > Gianluca Gennari wrote: > >> Il 15/05/2012 15:25, Mauro Carvalho Chehab ha scritto: >>> Em 15-05-2012 10:16, Gianluca Gennari escreveu: This patch: http://patchwork.linuxtv.org/patch/10824/ moved the file fixp-arith.h from drivers/input/ to include/linux/ . To make this file available to old kernels, we must include it in the media_build package. The version included here comes from kernel 3.4-rc7. This patch corrects the following build error: media_build/v4l/ov534.c:38:30: error: linux/fixp-arith.h: No such file or directory media_build/v4l/ov534.c: In function 'sethue': media_build/v4l/ov534.c:1000: error: implicit declaration of function 'fixp_sin' media_build/v4l/ov534.c:1001: error: implicit declaration of function 'fixp_cos' Tested on kernel 2.6.32-41-generic-pae (Ubuntu 10.04). Signed-off-by: Gianluca Gennari >>> --- linux/include/linux/fixp-arith.h | 87 ++ >>> >>> It is not that simple, as make clean will remove it. >>> >>> I can think on a few possible solutions for it: >>> 1) just don't compile ov534 on older kernels; >>> 2) add a backport patch that will dynamically create it; >>> 3) add linux/include/linux/fixp-arith.h inside the tarball with: >>> TARFILES += include/linux/fixp-arith.h >>> >>> Eventually, you can also tweak with the building system, but it doesn't >>> sound a good >>> idea to keep this header there as-is for kernels > 3.4, as some changes on >>> this header >>> can be added there. >>> >>> >From all above, (3) is the simpler one. I'll apply it. Applied, and tarball updated at linuxtv.org. The only thing left is the CONFIG_VIDEO_SMIAPP stuff. Sakari should be writing a fix for it today or tomorrow. >>> > [...] >> >> >> It looks like this file has not been changed in the last years, so >> chances are it will not change in the future. So adding it in the >> tarball file looks as a good solution. >> > > Hi, > > I just wanted to mention that it has been proposed to move part of > include/linux/fixp-arith.h to a .c file (maybe under lib/) in order to > share some code between the users, which are now 2 > (drivers/input/ff-memless.c and drivers/media/video/gspca/ov534.c). That makes sense. > I don't know yet if I'll do it or when it will be done but the file > _might_ change not too far in the future. No problem. If it changes to a *.c file, all we need to do is to add it at TARFILES. > > Regards, >Antonio > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] media_build: add fixp-arith.h in linux/include/linux
On Tue, 15 May 2012 15:35:15 +0200 Gianluca Gennari wrote: > Il 15/05/2012 15:25, Mauro Carvalho Chehab ha scritto: > > Em 15-05-2012 10:16, Gianluca Gennari escreveu: > >> This patch: > >> http://patchwork.linuxtv.org/patch/10824/ > >> moved the file fixp-arith.h from drivers/input/ to include/linux/ . > >> > >> To make this file available to old kernels, we must include it in the > >> media_build package. > >> > >> The version included here comes from kernel 3.4-rc7. > >> > >> This patch corrects the following build error: > >> > >> media_build/v4l/ov534.c:38:30: error: linux/fixp-arith.h: No such file or > >> directory > >> media_build/v4l/ov534.c: In function 'sethue': > >> media_build/v4l/ov534.c:1000: error: implicit declaration of function > >> 'fixp_sin' > >> media_build/v4l/ov534.c:1001: error: implicit declaration of function > >> 'fixp_cos' > >> > >> Tested on kernel 2.6.32-41-generic-pae (Ubuntu 10.04). > >> > >> Signed-off-by: Gianluca Gennari >> --- > >> linux/include/linux/fixp-arith.h | 87 > >> ++ > > > > It is not that simple, as make clean will remove it. > > > > I can think on a few possible solutions for it: > > 1) just don't compile ov534 on older kernels; > > 2) add a backport patch that will dynamically create it; > > 3) add linux/include/linux/fixp-arith.h inside the tarball with: > > TARFILES += include/linux/fixp-arith.h > > > > Eventually, you can also tweak with the building system, but it doesn't > > sound a good > > idea to keep this header there as-is for kernels > 3.4, as some changes on > > this header > > can be added there. > > > >>From all above, (3) is the simpler one. I'll apply it. > > [...] > > > It looks like this file has not been changed in the last years, so > chances are it will not change in the future. So adding it in the > tarball file looks as a good solution. > Hi, I just wanted to mention that it has been proposed to move part of include/linux/fixp-arith.h to a .c file (maybe under lib/) in order to share some code between the users, which are now 2 (drivers/input/ff-memless.c and drivers/media/video/gspca/ov534.c). I don't know yet if I'll do it or when it will be done but the file _might_ change not too far in the future. Regards, Antonio -- Antonio Ospite http://ao2.it A: Because it messes up the order in which people normally read text. See http://en.wikipedia.org/wiki/Posting_style Q: Why is top-posting such a bad thing? pgpnG0bz16HAV.pgp Description: PGP signature
Re: [PATCH] media_build: add fixp-arith.h in linux/include/linux
Em 15-05-2012 10:35, Gianluca Gennari escreveu: > Il 15/05/2012 15:25, Mauro Carvalho Chehab ha scritto: >> Em 15-05-2012 10:16, Gianluca Gennari escreveu: >>> This patch: >>> http://patchwork.linuxtv.org/patch/10824/ >>> moved the file fixp-arith.h from drivers/input/ to include/linux/ . >>> >>> To make this file available to old kernels, we must include it in the >>> media_build package. >>> >>> The version included here comes from kernel 3.4-rc7. >>> >>> This patch corrects the following build error: >>> >>> media_build/v4l/ov534.c:38:30: error: linux/fixp-arith.h: No such file or >>> directory >>> media_build/v4l/ov534.c: In function 'sethue': >>> media_build/v4l/ov534.c:1000: error: implicit declaration of function >>> 'fixp_sin' >>> media_build/v4l/ov534.c:1001: error: implicit declaration of function >>> 'fixp_cos' >>> >>> Tested on kernel 2.6.32-41-generic-pae (Ubuntu 10.04). >>> >>> Signed-off-by: Gianluca Gennari >> --- >>> linux/include/linux/fixp-arith.h | 87 >>> ++ >> >> It is not that simple, as make clean will remove it. >> >> I can think on a few possible solutions for it: >> 1) just don't compile ov534 on older kernels; >> 2) add a backport patch that will dynamically create it; >> 3) add linux/include/linux/fixp-arith.h inside the tarball with: >> TARFILES += include/linux/fixp-arith.h >> >> Eventually, you can also tweak with the building system, but it doesn't >> sound a good >> idea to keep this header there as-is for kernels > 3.4, as some changes on >> this header >> can be added there. >> >> >From all above, (3) is the simpler one. I'll apply it. >> >> Regards, >> Mauro >> > > > It looks like this file has not been changed in the last years, so > chances are it will not change in the future. So adding it in the > tarball file looks as a good solution. It isn't, as it breaks the build system: make -C linux dir= breaks, and also ./build --main-git breaks, as both assume that the files under /linux/foo/ are temporary files that they can rewrite/delete/etc anytime. Regards, Mauro > > Best regards, > Gianluca -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL FOR v3.5 v2] V4L2 subdev and sensor control changes and SMIA++ driver
Em 10-04-2012 16:35, Sakari Ailus escreveu: > Hi Mauro, > > This patchset adds > > - Integer menu controls, > - Selection IOCTL for subdevs, > - Sensor control improvements, > - link_validate() media entity and V4L2 subdev pad ops, > - OMAP 3 ISP driver improvements, > - SMIA++ sensor driver and > - Other V4L2 and media improvements (see individual patches) > > Changes since pull for 3.5 v1: > > - Rebased on top of for_v3.5 branch --- some of the earlier patches are > included in that branch: integer menu and subdev selections > (apart from docs) > - Fix DocBook build warnings in subdev selections and DPCM compressed raw > bayer pixel format documentation > > Changes since pull for 3.4 v3: > > - Changed kernel revision and V4L2 changelog dates appropriately for Linux > 3.5. > > Changes since pull v2: > > - Fixed incorrect 4CC codes in documentation for compresed raw bayer formats > > Changes since pull v1: > > - Correct selection rectangle field description in subdev selection > documentation (thanks to Sylwester) > - Use roundup() instead of ALIGN() in SMIA++ driver > - Rebased on current media_tree.git/staging/for_v3.4 > > --- > ... > drivers/media/video/smiapp/smiapp-debug.h | 32 + Please get rid of this horrible file that has just: #ifdef CONFIG_VIDEO_SMIAPP_DEBUG #define DEBUG #endif There's absolutely no reason to add something as ugly as this. To make this worse, it breaks media-build out-of-tree compilation: /home/v4l/media_build/v4l/smiapp-pll.c:25:33: fatal error: smiapp/smiapp-debug.h: No such file or directory compilation terminated. Thanks! Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] media_build: add fixp-arith.h in linux/include/linux
Il 15/05/2012 15:25, Mauro Carvalho Chehab ha scritto: > Em 15-05-2012 10:16, Gianluca Gennari escreveu: >> This patch: >> http://patchwork.linuxtv.org/patch/10824/ >> moved the file fixp-arith.h from drivers/input/ to include/linux/ . >> >> To make this file available to old kernels, we must include it in the >> media_build package. >> >> The version included here comes from kernel 3.4-rc7. >> >> This patch corrects the following build error: >> >> media_build/v4l/ov534.c:38:30: error: linux/fixp-arith.h: No such file or >> directory >> media_build/v4l/ov534.c: In function 'sethue': >> media_build/v4l/ov534.c:1000: error: implicit declaration of function >> 'fixp_sin' >> media_build/v4l/ov534.c:1001: error: implicit declaration of function >> 'fixp_cos' >> >> Tested on kernel 2.6.32-41-generic-pae (Ubuntu 10.04). >> >> Signed-off-by: Gianluca Gennari > --- >> linux/include/linux/fixp-arith.h | 87 >> ++ > > It is not that simple, as make clean will remove it. > > I can think on a few possible solutions for it: > 1) just don't compile ov534 on older kernels; > 2) add a backport patch that will dynamically create it; > 3) add linux/include/linux/fixp-arith.h inside the tarball with: > TARFILES += include/linux/fixp-arith.h > > Eventually, you can also tweak with the building system, but it doesn't sound > a good > idea to keep this header there as-is for kernels > 3.4, as some changes on > this header > can be added there. > >>From all above, (3) is the simpler one. I'll apply it. > > Regards, > Mauro > It looks like this file has not been changed in the last years, so chances are it will not change in the future. So adding it in the tarball file looks as a good solution. Best regards, Gianluca -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] media_build: add fixp-arith.h in linux/include/linux
Em 15-05-2012 10:16, Gianluca Gennari escreveu:
> This patch:
> http://patchwork.linuxtv.org/patch/10824/
> moved the file fixp-arith.h from drivers/input/ to include/linux/ .
>
> To make this file available to old kernels, we must include it in the
> media_build package.
>
> The version included here comes from kernel 3.4-rc7.
>
> This patch corrects the following build error:
>
> media_build/v4l/ov534.c:38:30: error: linux/fixp-arith.h: No such file or
> directory
> media_build/v4l/ov534.c: In function 'sethue':
> media_build/v4l/ov534.c:1000: error: implicit declaration of function
> 'fixp_sin'
> media_build/v4l/ov534.c:1001: error: implicit declaration of function
> 'fixp_cos'
>
> Tested on kernel 2.6.32-41-generic-pae (Ubuntu 10.04).
>
> Signed-off-by: Gianluca Gennari ---
> linux/include/linux/fixp-arith.h | 87
> ++
It is not that simple, as make clean will remove it.
I can think on a few possible solutions for it:
1) just don't compile ov534 on older kernels;
2) add a backport patch that will dynamically create it;
3) add linux/include/linux/fixp-arith.h inside the tarball with:
TARFILES += include/linux/fixp-arith.h
Eventually, you can also tweak with the building system, but it doesn't sound a
good
idea to keep this header there as-is for kernels > 3.4, as some changes on this
header
can be added there.
>From all above, (3) is the simpler one. I'll apply it.
Regards,
Mauro
> 1 files changed, 87 insertions(+), 0 deletions(-)
> create mode 100644 linux/include/linux/fixp-arith.h
>
> diff --git a/linux/include/linux/fixp-arith.h
> b/linux/include/linux/fixp-arith.h
> new file mode 100644
> index 000..3089d73
> --- /dev/null
> +++ b/linux/include/linux/fixp-arith.h
> @@ -0,0 +1,87 @@
> +#ifndef _FIXP_ARITH_H
> +#define _FIXP_ARITH_H
> +
> +/*
> + * Simplistic fixed-point arithmetics.
> + * Hmm, I'm probably duplicating some code :(
> + *
> + * Copyright (c) 2002 Johann Deneux
> + */
> +
> +/*
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + *
> + * Should you need to contact me, the author, you can do so by
> + * e-mail - mail your message to
> + */
> +
> +#include
> +
> +/* The type representing fixed-point values */
> +typedef s16 fixp_t;
> +
> +#define FRAC_N 8
> +#define FRAC_MASK ((1< +
> +/* Not to be used directly. Use fixp_{cos,sin} */
> +static const fixp_t cos_table[46] = {
> + 0x0100, 0x00FF, 0x00FF, 0x00FE, 0x00FD, 0x00FC, 0x00FA, 0x00F8,
> + 0x00F6, 0x00F3, 0x00F0, 0x00ED, 0x00E9, 0x00E6, 0x00E2, 0x00DD,
> + 0x00D9, 0x00D4, 0x00CF, 0x00C9, 0x00C4, 0x00BE, 0x00B8, 0x00B1,
> + 0x00AB, 0x00A4, 0x009D, 0x0096, 0x008F, 0x0087, 0x0080, 0x0078,
> + 0x0070, 0x0068, 0x005F, 0x0057, 0x004F, 0x0046, 0x003D, 0x0035,
> + 0x002C, 0x0023, 0x001A, 0x0011, 0x0008, 0x
> +};
> +
> +
> +/* a: 123 -> 123.0 */
> +static inline fixp_t fixp_new(s16 a)
> +{
> + return a< +}
> +
> +/* a: 0x -> -1.0
> + 0x8000 -> 1.0
> + 0x -> 0.0
> +*/
> +static inline fixp_t fixp_new16(s16 a)
> +{
> + return ((s32)a)>>(16-FRAC_N);
> +}
> +
> +static inline fixp_t fixp_cos(unsigned int degrees)
> +{
> + int quadrant = (degrees / 90) & 3;
> + unsigned int i = degrees % 90;
> +
> + if (quadrant == 1 || quadrant == 3)
> + i = 90 - i;
> +
> + i >>= 1;
> +
> + return (quadrant == 1 || quadrant == 2)? -cos_table[i] : cos_table[i];
> +}
> +
> +static inline fixp_t fixp_sin(unsigned int degrees)
> +{
> + return -fixp_cos(degrees + 90);
> +}
> +
> +static inline fixp_t fixp_mult(fixp_t a, fixp_t b)
> +{
> + return ((s32)(a*b))>>FRAC_N;
> +}
> +
> +#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] media_build: add fixp-arith.h in linux/include/linux
This patch:
http://patchwork.linuxtv.org/patch/10824/
moved the file fixp-arith.h from drivers/input/ to include/linux/ .
To make this file available to old kernels, we must include it in the
media_build package.
The version included here comes from kernel 3.4-rc7.
This patch corrects the following build error:
media_build/v4l/ov534.c:38:30: error: linux/fixp-arith.h: No such file or
directory
media_build/v4l/ov534.c: In function 'sethue':
media_build/v4l/ov534.c:1000: error: implicit declaration of function 'fixp_sin'
media_build/v4l/ov534.c:1001: error: implicit declaration of function 'fixp_cos'
Tested on kernel 2.6.32-41-generic-pae (Ubuntu 10.04).
Signed-off-by: Gianluca Gennari
+ */
+
+#include
+
+/* The type representing fixed-point values */
+typedef s16 fixp_t;
+
+#define FRAC_N 8
+#define FRAC_MASK ((1< 123.0 */
+static inline fixp_t fixp_new(s16 a)
+{
+ return a< -1.0
+ 0x8000 -> 1.0
+ 0x -> 0.0
+*/
+static inline fixp_t fixp_new16(s16 a)
+{
+ return ((s32)a)>>(16-FRAC_N);
+}
+
+static inline fixp_t fixp_cos(unsigned int degrees)
+{
+ int quadrant = (degrees / 90) & 3;
+ unsigned int i = degrees % 90;
+
+ if (quadrant == 1 || quadrant == 3)
+ i = 90 - i;
+
+ i >>= 1;
+
+ return (quadrant == 1 || quadrant == 2)? -cos_table[i] : cos_table[i];
+}
+
+static inline fixp_t fixp_sin(unsigned int degrees)
+{
+ return -fixp_cos(degrees + 90);
+}
+
+static inline fixp_t fixp_mult(fixp_t a, fixp_t b)
+{
+ return ((s32)(a*b))>>FRAC_N;
+}
+
+#endif
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: patch for Asus My Cinema PS3-100 (1043:48cd)
Em 05-04-2012 06:40, remi schwartz escreveu:
> Hi all,
>
> This is the patch against kernel 2.6.32 I used to get my TV card Asus
> My Cinema PS3-100 (1043:48cd) to work.
Please, don't sent patches against older kernel versions, as they won't
apply anymore upstream. In particular, since kernel 2.6.32, the entire
RC code were re-written.
You can test the very latest media code using the media-build tree,
available at:
http://git.linuxtv.org/media_build.git
It compiles against old kernels (although won't compile the gspca driver
since yesterday, as I'm applying a massive amount of patches those days
and didn't have any time yet to fix gspca build).
>
> More information on this card can be found on this page :
>
> http://www.0xf8.org/2009/09/asus-mycinema-ps3-100-3-in-1-tv-card/
>
> This card seems to be a clone of the Asus Tiger 3in1, numbered 147 in the
> SAA7134 module, so I gave it the temporary number of 1470.
>
> DVB-T and remote have been tested and work fine.
> DVB-S, FM and Composite input haven't been tested.
>
> Hope that will help some of you.
In order to help adding support for this board, I re-wrote your code to
apply it against the latest build.
I suspect that your RC keycode table is incomplete, as it is getting just
the 8 least significant bits. So, you'll need to test it and fix the
IR keytable.
Please test. Feel free to modify it, as I suspect that you'll need to
re-work with the RC part of it.
Regards,
Mauro
-
Add support for Asus My Cinema PS3-100 (1043:48cd)
Based on a previous patch from remi schwartz
Thanks-to: Remi Schwartz
Signed-off-to: Mauro Carvalho Chehab
Index: patchwork/drivers/media/video/saa7134/saa7134-input.c
===
--- patchwork.orig/drivers/media/video/saa7134/saa7134-input.c
+++ patchwork/drivers/media/video/saa7134/saa7134-input.c
@@ -753,6 +753,11 @@ int saa7134_input_init1(struct saa7134_d
mask_keycode = 0x;
raw_decode = true;
break;
+ case SAA7134_BOARD_ASUSTeK_PS3_100:
+ ir_codes = RC_MAP_ASUS_PS3_100;
+ mask_keydown = 0x004;
+ raw_decode = true;
+ break;
case SAA7134_BOARD_ENCORE_ENLTV:
case SAA7134_BOARD_ENCORE_ENLTV_FM:
ir_codes = RC_MAP_ENCORE_ENLTV;
Index: patchwork/drivers/media/video/saa7134/saa7134-dvb.c
===
--- patchwork.orig/drivers/media/video/saa7134/saa7134-dvb.c
+++ patchwork/drivers/media/video/saa7134/saa7134-dvb.c
@@ -881,6 +881,20 @@ static struct tda1004x_config asus_tiger
.request_firmware = philips_tda1004x_request_firmware
};
+static struct tda1004x_config asus_ps3_100_config = {
+ .demod_address = 0x0b,
+ .invert= 1,
+ .invert_oclk = 0,
+ .xtal_freq = TDA10046_XTAL_16M,
+ .agc_config= TDA10046_AGC_TDA827X,
+ .gpio_config = TDA10046_GP11_I,
+ .if_freq = TDA10046_FREQ_045,
+ .i2c_gate = 0x4b,
+ .tuner_address = 0x61,
+ .antenna_switch = 1,
+ .request_firmware = philips_tda1004x_request_firmware
+};
+
/* --
* special case: this card uses saa713x GPIO22 for the mode switch
*/
@@ -1649,6 +1663,31 @@ static int dvb_init(struct saa7134_dev *
" found!\n", __func__);
goto dettach_frontend;
}
+ }
+ }
+ break;
+ case SAA7134_BOARD_ASUSTeK_PS3_100:
+ if (!use_frontend) { /* terrestrial */
+ if (configure_tda827x_fe(dev, &asus_ps3_100_config,
+ &tda827x_cfg_2) < 0)
+ goto dettach_frontend;
+ } else {/* satellite */
+ fe0->dvb.frontend = dvb_attach(tda10086_attach,
+ &flydvbs, &dev->i2c_adap);
+ if (fe0->dvb.frontend) {
+ if (dvb_attach(tda826x_attach,
+ fe0->dvb.frontend, 0x60,
+ &dev->i2c_adap, 0) == NULL) {
+ wprintk("%s: Asus My Cinema PS3-100, no
"
+ "tda826x found!\n", __func__);
+ goto dettach_frontend;
+ }
+ if (dvb_attach(lnbp21_attach, fe0->dvb.frontend,
+ &dev->i2c_adap, 0, 0) == NULL) {
+ wprintk("%s: Asus My Cinema PS3-100, no
lnbp21"
+
Re: [PATCH 1/3] stv090x: Fix typo in register macros
Hi Andreas,
Sorry about the late reply.
Which datasheet revision are you using ? I looked at RevG and found that the
register ERRCNT22 @ 0xF59D, 0xF39D do have bitfields by name Px_ERR_CNT2
on Page 227.
Did you overlook that by some chance ?
Best Regards,
Manu
On Tue, Feb 28, 2012 at 2:12 AM, Andreas Regel wrote:
> Fix typo in register macros of ERRCNT2.
>
> Signed-off-by: Andreas Regel
> ---
> drivers/media/dvb/frontends/stv090x.c | 2 +-
> drivers/media/dvb/frontends/stv090x_reg.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/dvb/frontends/stv090x.c
> b/drivers/media/dvb/frontends/stv090x.c
> index 4aef187..6c3c095 100644
> --- a/drivers/media/dvb/frontends/stv090x.c
> +++ b/drivers/media/dvb/frontends/stv090x.c
> @@ -3526,7 +3526,7 @@ static int stv090x_read_per(struct dvb_frontend *fe,
> u32 *per)
> } else {
> /* Counter 2 */
> reg = STV090x_READ_DEMOD(state, ERRCNT22);
> - h = STV090x_GETFIELD_Px(reg, ERR_CNT2_FIELD);
> + h = STV090x_GETFIELD_Px(reg, ERR_CNT22_FIELD);
> reg = STV090x_READ_DEMOD(state, ERRCNT21);
> m = STV090x_GETFIELD_Px(reg, ERR_CNT21_FIELD);
> diff --git a/drivers/media/dvb/frontends/stv090x_reg.h
> b/drivers/media/dvb/frontends/stv090x_reg.h
> index 93741ee..26c8885 100644
> --- a/drivers/media/dvb/frontends/stv090x_reg.h
> +++ b/drivers/media/dvb/frontends/stv090x_reg.h
> @@ -2232,8 +2232,8 @@
> #define STV090x_P2_ERRCNT22
> STV090x_Px_ERRCNT22(2)
> #define STV090x_OFFST_Px_ERRCNT2_OLDVALUE_FIELD 7
> #define STV090x_WIDTH_Px_ERRCNT2_OLDVALUE_FIELD 1
> -#define STV090x_OFFST_Px_ERR_CNT2_FIELD 0
> -#define STV090x_WIDTH_Px_ERR_CNT2_FIELD 7
> +#define STV090x_OFFST_Px_ERR_CNT22_FIELD 0
> +#define STV090x_WIDTH_Px_ERR_CNT22_FIELD 7
> #define STV090x_Px_ERRCNT21(__x) (0xF59E - (__x - 1) *
> 0x200)
> #define STV090x_P1_ERRCNT21
> STV090x_Px_ERRCNT21(1)
> --
> 1.7.2.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Terratec Cinergy C PCI HD (CI)
On Wed, May 9, 2012 at 4:53 PM, Igor M. Liplianin wrote: > This patch seems for rectifying a typo. But actually the difference between > mantis_vp2040.c and mantis_vp2033.c code is a card name only. > > Signed-off-by: Igor M. Liplianin Do you have a card with the tda10021 or the tda10023 ? -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL FOR v3.5] Rebased version of the new Timings API
Hi Mauro, Rebased as there were some conflicts after all the recent changes. Also tested DocBook, works fine for me. Note that I get this: Error: no ID for constraint linkend: v4l2-auto-focus-area. Something missing in those focus control patches. Regards, Hans The following changes since commit 152a3a7320d1582009db85d8be365ce430d079af: [media] v4l2-dev: rename two functions (2012-05-14 15:06:50 -0300) are available in the git repository at: git://linuxtv.org/hverkuil/media_tree.git timingsv6 for you to fetch changes up to dc3ea70ea7d9b710b1e8bab83e92165806f91a42: V4L2: Mark the DV Preset API as deprecated. (2012-05-15 13:09:56 +0200) Hans Verkuil (7): videodev2.h: add enum/query/cap dv_timings ioctls. V4L2 spec: document the new V4L2 DV timings ioctls. v4l2 framework: add support for the new dv_timings ioctls. v4l2-dv-timings.h: definitions for CEA-861 and VESA DMT timings. tvp7002: add support for the new dv timings API. Feature removal: remove invalid DV presets. V4L2: Mark the DV Preset API as deprecated. Documentation/DocBook/media/v4l/biblio.xml | 18 ++ Documentation/DocBook/media/v4l/common.xml | 38 ++-- Documentation/DocBook/media/v4l/compat.xml | 17 ++ Documentation/DocBook/media/v4l/v4l2.xml| 15 +- Documentation/DocBook/media/v4l/vidioc-create-bufs.xml |6 + Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml | 211 ++ Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml |4 + Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml | 119 + Documentation/DocBook/media/v4l/vidioc-enuminput.xml|2 +- Documentation/DocBook/media/v4l/vidioc-enumoutput.xml |2 +- Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml |6 + Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml | 130 -- Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml |6 + Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml |4 + Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml | 104 +++ Documentation/feature-removal-schedule.txt |9 + drivers/media/video/tvp7002.c | 102 +-- drivers/media/video/v4l2-compat-ioctl32.c |3 + drivers/media/video/v4l2-ioctl.c| 126 + include/linux/Kbuild|1 + include/linux/v4l2-dv-timings.h | 816 + include/linux/videodev2.h | 179 --- include/media/v4l2-ioctl.h |6 + include/media/v4l2-subdev.h |6 + 24 files changed, 1825 insertions(+), 105 deletions(-) create mode 100644 Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml create mode 100644 Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml create mode 100644 Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml create mode 100644 include/linux/v4l2-dv-timings.h -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/6] v4l/dvb: fix Kconfig dependencies on VIDEO_CAPTURE_DRIVERS
Em 15-05-2012 07:44, Mauro Carvalho Chehab escreveu: > Em 03-05-2012 19:22, mathieu.poir...@linaro.org escreveu: >> From: Arnd Bergmann >> >> Kconfig warns about unsatisfied dependencies of symbols that >> are directly selected. >> >> Many capture drivers depend on DVB capture drivers, which >> are hidden behind the CONFIG_DVB_CAPTURE_DRIVERS setting. >> >> The solution here is to enable DVB_CAPTURE_DRIVERS unconditionally >> when both DVB and VIDEO_CAPTURE_DRIVERS are enabled. >> >> Signed-off-by: Arnd Bergmann >> Signed-off-by: Mathieu Poirier >> --- >> drivers/media/dvb/Kconfig |2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig >> index f6e40b3..c617996 100644 >> --- a/drivers/media/dvb/Kconfig >> +++ b/drivers/media/dvb/Kconfig >> @@ -29,7 +29,7 @@ config DVB_DYNAMIC_MINORS >>If you are unsure about this, say N here. >> >> menuconfig DVB_CAPTURE_DRIVERS >> -bool "DVB/ATSC adapters" >> +bool "DVB/ATSC adapters" if !VIDEO_CAPTURE_DRIVERS >> depends on DVB_CORE >> default y >> ---help--- > > No, this is not right. Users can select either DVB or V4L2 (or hybrid) > devices independently. > > If now a warning is happening, is because something changed Kconfig > behavior on some non-expected way. I remember a similar bug in the past that it was solved by using a new Kconfig dialect "visible if". Not sure it this applies here. > > Nack. > > Regards, > Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/6] v4l/dvb: fix Kconfig dependencies on VIDEO_CAPTURE_DRIVERS
Em 03-05-2012 19:22, mathieu.poir...@linaro.org escreveu: > From: Arnd Bergmann > > Kconfig warns about unsatisfied dependencies of symbols that > are directly selected. > > Many capture drivers depend on DVB capture drivers, which > are hidden behind the CONFIG_DVB_CAPTURE_DRIVERS setting. > > The solution here is to enable DVB_CAPTURE_DRIVERS unconditionally > when both DVB and VIDEO_CAPTURE_DRIVERS are enabled. > > Signed-off-by: Arnd Bergmann > Signed-off-by: Mathieu Poirier > --- > drivers/media/dvb/Kconfig |2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig > index f6e40b3..c617996 100644 > --- a/drivers/media/dvb/Kconfig > +++ b/drivers/media/dvb/Kconfig > @@ -29,7 +29,7 @@ config DVB_DYNAMIC_MINORS > If you are unsure about this, say N here. > > menuconfig DVB_CAPTURE_DRIVERS > - bool "DVB/ATSC adapters" > + bool "DVB/ATSC adapters" if !VIDEO_CAPTURE_DRIVERS > depends on DVB_CORE > default y > ---help--- No, this is not right. Users can select either DVB or V4L2 (or hybrid) devices independently. If now a warning is happening, is because something changed Kconfig behavior on some non-expected way. Nack. Regards, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL FOR 3.5] Samsung media driver updates
Hi Mauro, The following changes since commit e89fca923f32de26b69bf4cd604f7b960b161551: [media] gspca - ov534: Add Hue control (2012-05-14 09:48:00 -0300) are available in the git repository at: git://git.infradead.org/users/kmpark/linux-samsung v4l_samsung_for_v3.5 for you to fetch changes up to 5aeade300821356695046a814c86bd1ebfeb5bde: s5p-mfc: Use devm_* functions in s5p_mfc.c file (2012-05-14 18:33:44 +0200) This are updates for s5p-tv driver and other various fixes and improvements for drivers/media/video/s5p-*. Marek Szyprowski (1): v4l: s5p-tv: fix plane size calculation Sachin Kamat (10): v4l: s5p-tv: Fix section mismatch warning in mixer_video.c s5p-mfc: Fix NULL pointer warnings s5p-mfc: Add missing static storage class to silence warnings s5p-g2d: Fix NULL pointer warnings in g2d.c file s5p-g2d: Add missing static storage class in g2d.c file s5p-jpeg: Make s5p_jpeg_g_selection function static s5p-mfc: Add missing static storage class in s5p_mfc_enc.c file s5p-g2d: Use devm_* functions in g2d.c file s5p-jpeg: Use devm_* functions in jpeg-core.c file s5p-mfc: Use devm_* functions in s5p_mfc.c file Tomasz Stanislawski (5): v4l: s5p-tv: mixer: fix compilation warning v4l: s5p-tv: hdmiphy: add support for per-platform variants v4l: s5p-tv: hdmi: parametrize DV timings v4l: s5p-tv: hdmi: fix mode synchronization v4l: s5p-tv: mixer: fix handling of interlaced modes drivers/media/video/s5p-g2d/g2d.c| 65 +- drivers/media/video/s5p-g2d/g2d.h|1 - drivers/media/video/s5p-jpeg/jpeg-core.c | 60 +++-- drivers/media/video/s5p-jpeg/jpeg-core.h |2 - drivers/media/video/s5p-mfc/s5p_mfc.c| 75 +--- drivers/media/video/s5p-mfc/s5p_mfc_common.h |2 - drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c | 16 ++-- drivers/media/video/s5p-mfc/s5p_mfc_enc.c|6 +- drivers/media/video/s5p-mfc/s5p_mfc_opr.c| 28 +++--- drivers/media/video/s5p-tv/hdmi_drv.c| 480 ++- drivers/media/video/s5p-tv/hdmiphy_drv.c | 225 ++ drivers/media/video/s5p-tv/mixer.h |3 +- drivers/media/video/s5p-tv/mixer_reg.c | 15 ++-- drivers/media/video/s5p-tv/mixer_video.c |6 +- drivers/media/video/s5p-tv/regs-hdmi.h |1 + 15 files changed, 503 insertions(+), 482 deletions(-) --- Thank you, -- Sylwester Nawrocki Samsung Poland R&D Center -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
re: [media] cx23885-dvb: Remove a dirty hack that would require DVBv3
Hi, I'm working some new Smatch stuff and sending bug reports for old code. -Dan --- This is a semi-automatic email about new static checker warnings. The patch a7d44baaed0a: "[media] cx23885-dvb: Remove a dirty hack that would require DVBv3" from Dec 26, 2011, leads to the following Smatch complaint: drivers/media/video/cx23885/cx23885-dvb.c:137 cx23885_dvb_gate_ctrl() error: we previously assumed 'fe->dvb.frontend' could be null (see line 130) drivers/media/video/cx23885/cx23885-dvb.c 129 130 if (fe && fe->dvb.frontend && fe->dvb.frontend->ops.i2c_gate_ctrl) ^^ Old check. 131 fe->dvb.frontend->ops.i2c_gate_ctrl(fe->dvb.frontend, open); 132 133 /* 134 * FIXME: Improve this path to avoid calling the 135 * cx23885_dvb_set_frontend() every time it passes here. 136 */ 137 cx23885_dvb_set_frontend(fe->dvb.frontend); New call to cx23885_dvb_set_frontend(). If "fe->dvb.frontend" is NULL then we will oops in cx23885_dvb_set_frontend(). Also if "fe" is NULL we'll oops right here. 138 } 139 regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
