aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-04-18 00:22:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:58:15 -0300
commit01a9cd99cfd5b91ca38df74db60629d76e83cb94 (patch)
treeabb7de8220116d41cf14810e581b01509ebd9634 /drivers/media
parentc344933af5a8610d71bd0d92fe43a1519ed72ed8 (diff)
V4L/DVB (3817): KWorld HardwareMpegTV XPert: set encoder video standard based on tvnorm
The KWorld HardwareMpegTV XPert uses a multistandard tuner, tda8290 + tda8275. Without checking the video standard in blackbird_probe, the encoder defaults to PAL, even if the incoming video stream is NTSC. This patch checks the video standard set by the cx2388x decoder, and sets the encoding height and frame accordingly. This patch is designed to only affect the KWorld HardwareMpegTV XPert. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 75ee8358f1c..be367c5c529 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1686,8 +1686,8 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params));
memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params));
- if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) {
-
+ switch (core->board) {
+ case CX88_BOARD_HAUPPAUGE_ROSLYN:
if (core->tuner_formats & V4L2_STD_525_60) {
dev->height = 480;
dev->params.vi_frame_rate = 30;
@@ -1695,7 +1695,16 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
dev->height = 576;
dev->params.vi_frame_rate = 25;
}
-
+ break;
+ case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
+ if (core->tvnorm->id & V4L2_STD_525_60) {
+ dev->height = 480;
+ dev->params.vi_frame_rate = 30;
+ } else {
+ dev->height = 576;
+ dev->params.vi_frame_rate = 25;
+ }
+ break;
}
err = cx8802_init_common(dev);