From: Steven Toth Date: Wed, 4 Jan 2012 13:54:32 +0000 (-0300) Subject: [media] cx23885: Ensure the MPEG encoder height is configured from the norm X-Git-Tag: firefly_0821_release~3680^2~2904^2~294 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=38e3d7ce41cff58bacebb2bcecf7d386c60b954b;p=firefly-linux-kernel-4.4.55.git [media] cx23885: Ensure the MPEG encoder height is configured from the norm Bugfix: The height was not always correctly configured if switching between different video standards. Change the encode height based on the standard. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c index c5ddcac96cb1..f65e38cfb1d9 100644 --- a/drivers/media/video/cx23885/cx23885-417.c +++ b/drivers/media/video/cx23885/cx23885-417.c @@ -1023,6 +1023,12 @@ static void cx23885_codec_settings(struct cx23885_dev *dev) { dprintk(1, "%s()\n", __func__); + /* Dynamically change the height based on video standard */ + if (dev->encodernorm.id & V4L2_STD_525_60) + dev->ts1.height = 480; + else + dev->ts1.height = 576; + /* assign frame size */ cx23885_api_cmd(dev, CX2341X_ENC_SET_FRAME_SIZE, 2, 0, dev->ts1.height, dev->ts1.width);