Re: [RFC/PATCH 2/5] vpif: Move and extend ch_params[]
On Sun, Oct 24, 2010 at 10:13 AM, Muralidharan Karicheri
mkarich...@gmail.com wrote:
Acked-by : Murali Karicheri mkarich...@gmail.com
On Fri, Oct 22, 2010 at 3:00 AM, mats.randga...@tandberg.com wrote:
From: Mats Randgaard mats.randga...@tandberg.com
- The ch_params tables in vpif_capture.c and vpif_display.c are moved to a
common
table in vpif.c. Then it is easier to maintain the table.
- The new table is extended with all the DV formats supportet by TVP7002.
- The field fps is removed from the struct vpif_channel_config_params
because it
is not used.
- The field dv_preset is added to the struct vpif_channel_config_params
to
support DV formats.
Signed-off-by: Mats Randgaard mats.randga...@tandberg.com
Signed-off-by: Hans Verkuil hans.verk...@tandberg.com
---
drivers/media/video/davinci/vpif.c | 178
drivers/media/video/davinci/vpif.h | 5 +-
drivers/media/video/davinci/vpif_capture.c | 18 +---
drivers/media/video/davinci/vpif_display.c | 17 +--
4 files changed, 187 insertions(+), 31 deletions(-)
diff --git a/drivers/media/video/davinci/vpif.c
b/drivers/media/video/davinci/vpif.c
index 1f532e3..baa9462 100644
--- a/drivers/media/video/davinci/vpif.c
+++ b/drivers/media/video/davinci/vpif.c
@@ -41,6 +41,184 @@ spinlock_t vpif_lock;
void __iomem *vpif_base;
+/**
+ * ch_params: video standard configuration parameters for vpif
+ * The table must include all presets from supported subdevices.
+ */
+const struct vpif_channel_config_params ch_params[] = {
+ /* HDTV formats */
+ {
+ .name = 480p59_94,
+ .width = 720,
+ .height = 480,
+ .frm_fmt = 1,
+ .ycmux_mode = 0,
+ .eav2sav = 138-8,
+ .sav2eav = 720,
+ .l1 = 1,
+ .l3 = 43,
+ .l5 = 523,
+ .vsize = 525,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_480P59_94,
+ },
+ {
+ .name = 576p50,
+ .width = 720,
+ .height = 576,
+ .frm_fmt = 1,
+ .ycmux_mode = 0,
+ .eav2sav = 144-8,
+ .sav2eav = 720,
+ .l1 = 1,
+ .l3 = 45,
+ .l5 = 621,
+ .vsize = 625,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_576P50,
+ },
+ {
+ .name = 720p50,
+ .width = 1280,
+ .height = 720,
+ .frm_fmt = 1,
+ .ycmux_mode = 0,
+ .eav2sav = 700-8,
+ .sav2eav = 1280,
+ .l1 = 1,
+ .l3 = 26,
+ .l5 = 746,
+ .vsize = 750,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_720P50,
+ },
+ {
+ .name = 720p60,
+ .width = 1280,
+ .height = 720,
+ .frm_fmt = 1,
+ .ycmux_mode = 0,
+ .eav2sav = 370 - 8,
+ .sav2eav = 1280,
+ .l1 = 1,
+ .l3 = 26,
+ .l5 = 746,
+ .vsize = 750,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_720P60,
+ },
+ {
+ .name = 1080I50,
+ .width = 1920,
+ .height = 1080,
+ .frm_fmt = 0,
+ .ycmux_mode = 0,
+ .eav2sav = 720 - 8,
+ .sav2eav = 1920,
+ .l1 = 1,
+ .l3 = 21,
+ .l5 = 561,
+ .l7 = 563,
+ .l9 = 584,
+ .l11 = 1124,
+ .vsize = 1125,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_1080I50,
+ },
+ {
+ .name = 1080I60,
+ .width = 1920,
+ .height = 1080,
+ .frm_fmt = 0,
+ .ycmux_mode = 0,
+ .eav2sav = 280 - 8,
+ .sav2eav = 1920,
+ .l1 = 1,
+ .l3 = 21,
+ .l5 = 561,
+ .l7 = 563,
+ .l9 = 584,
+ .l11 = 1124,
+ .vsize = 1125,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_1080I60,
+ },
+ {
+ .name = 1080p60,
+ .width = 1920,
+ .height = 1080,
+
RE: [RFC/PATCH 2/5] vpif: Move and extend ch_params[]
-Original Message-
From: mats.randga...@tandberg.com [mailto:mats.randga...@tandberg.com]
Sent: Friday, October 22, 2010 12:31 PM
To: Hiremath, Vaibhav
Cc: linux-media@vger.kernel.org; hans.verk...@tandberg.com; Mats Randgaard
Subject: [RFC/PATCH 2/5] vpif: Move and extend ch_params[]
[Hiremath, Vaibhav] I think subject line should be changed here to something
like,
[RFC/PATCH 2/5] vpif: Consolidate formats from both capture and display
From: Mats Randgaard mats.randga...@tandberg.com
- The ch_params tables in vpif_capture.c and vpif_display.c are moved to a
common
table in vpif.c. Then it is easier to maintain the table.
- The new table is extended with all the DV formats supportet by TVP7002.
[Hiremath, Vaibhav] I suggest you to make this change as a part of you another
patch [RFC/PATCH 3/5] vpif_cap/disp: Added support for DV presets.
- The field fps is removed from the struct vpif_channel_config_params
because it
is not used.
- The field dv_preset is added to the struct vpif_channel_config_params
to
support DV formats.
[Hiremath, Vaibhav] Same here.
It should be logically divided, so I propose something,
[RFC/PATCH 2/5] vpif: Consolidate formats from both capture and display
Will only do cleanup, and move the ch_params to vpif.c file.
[RFC/PATCH 3/5] vpif_cap/disp: Added support for DV presets
This should cater to complete dv_preset enhancements.
Rest looks ok to me.
Thanks,
Vaibhav
Signed-off-by: Mats Randgaard mats.randga...@tandberg.com
Signed-off-by: Hans Verkuil hans.verk...@tandberg.com
---
drivers/media/video/davinci/vpif.c | 178
drivers/media/video/davinci/vpif.h |5 +-
drivers/media/video/davinci/vpif_capture.c | 18 +---
drivers/media/video/davinci/vpif_display.c | 17 +--
4 files changed, 187 insertions(+), 31 deletions(-)
diff --git a/drivers/media/video/davinci/vpif.c
b/drivers/media/video/davinci/vpif.c
index 1f532e3..baa9462 100644
--- a/drivers/media/video/davinci/vpif.c
+++ b/drivers/media/video/davinci/vpif.c
@@ -41,6 +41,184 @@ spinlock_t vpif_lock;
void __iomem *vpif_base;
+/**
+ * ch_params: video standard configuration parameters for vpif
+ * The table must include all presets from supported subdevices.
+ */
+const struct vpif_channel_config_params ch_params[] = {
+ /* HDTV formats */
+ {
+ .name = 480p59_94,
+ .width = 720,
+ .height = 480,
+ .frm_fmt = 1,
+ .ycmux_mode = 0,
+ .eav2sav = 138-8,
+ .sav2eav = 720,
+ .l1 = 1,
+ .l3 = 43,
+ .l5 = 523,
+ .vsize = 525,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_480P59_94,
+ },
+ {
+ .name = 576p50,
+ .width = 720,
+ .height = 576,
+ .frm_fmt = 1,
+ .ycmux_mode = 0,
+ .eav2sav = 144-8,
+ .sav2eav = 720,
+ .l1 = 1,
+ .l3 = 45,
+ .l5 = 621,
+ .vsize = 625,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_576P50,
+ },
+ {
+ .name = 720p50,
+ .width = 1280,
+ .height = 720,
+ .frm_fmt = 1,
+ .ycmux_mode = 0,
+ .eav2sav = 700-8,
+ .sav2eav = 1280,
+ .l1 = 1,
+ .l3 = 26,
+ .l5 = 746,
+ .vsize = 750,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_720P50,
+ },
+ {
+ .name = 720p60,
+ .width = 1280,
+ .height = 720,
+ .frm_fmt = 1,
+ .ycmux_mode = 0,
+ .eav2sav = 370 - 8,
+ .sav2eav = 1280,
+ .l1 = 1,
+ .l3 = 26,
+ .l5 = 746,
+ .vsize = 750,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_720P60,
+ },
+ {
+ .name = 1080I50,
+ .width = 1920,
+ .height = 1080,
+ .frm_fmt = 0,
+ .ycmux_mode = 0,
+ .eav2sav = 720 - 8,
+ .sav2eav = 1920,
+ .l1 = 1,
+ .l3 = 21,
+ .l5 = 561,
+ .l7 = 563,
+ .l9 = 584,
+ .l11 = 1124,
+ .vsize = 1125,
+ .capture_format = 0,
+ .vbi_supported = 0,
+ .hd_sd = 1,
+ .dv_preset = V4L2_DV_1080I50,
+ },
+ {
+ .name = 1080I60,
+ .width = 1920,
+ .height = 1080,
+
