提交 45f87a21 编写于 作者: M Michael Krufky 提交者: Mauro Carvalho Chehab

V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id

Removed the switch..case block in blackbird_probe for setting encoder height
based on video standard. All blackbird devices can rely on tvnorm->id to
retrieve this information from the cx2388x video decoder - tuner_formats
should not be used to determine the encoding video standard.
Signed-off-by: NMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 15396236
...@@ -1045,22 +1045,11 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, ...@@ -1045,22 +1045,11 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
cx2341x_fill_defaults(&dev->params); cx2341x_fill_defaults(&dev->params);
dev->params.port = CX2341X_PORT_STREAMING; dev->params.port = CX2341X_PORT_STREAMING;
switch (core->board) {
case CX88_BOARD_HAUPPAUGE_ROSLYN:
if (core->tuner_formats & V4L2_STD_525_60) {
dev->height = 480;
} else {
dev->height = 576;
}
break;
case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
if (core->tvnorm->id & V4L2_STD_525_60) { if (core->tvnorm->id & V4L2_STD_525_60) {
dev->height = 480; dev->height = 480;
} else { } else {
dev->height = 576; dev->height = 576;
} }
break;
}
err = cx8802_init_common(dev); err = cx8802_init_common(dev);
if (0 != err) if (0 != err)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册