aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/ti-vpe
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2014-03-10 02:57:40 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-04-07 08:43:05 -0400
commit67fb87eec08a7705b0b8177095b1ef099a05b8c9 (patch)
tree433e72c0495973e58a191b4a95029e526f43366e /drivers/media/platform/ti-vpe
parentb20902b92e6a49ab21a79d4b2e56a6dd0085c696 (diff)
[media] v4l: ti-vpe: Fix initial configuration queue data
The vpe output and capture queues are initially configured to default values in vpe_open(). A G_FMT before any S_FMTs will result in these values being populated. The colorspace and bytesperline parameter of this initial configuration are incorrect. This breaks compliance when as we get 'TRY_FMT(G_FMT) != G_FMT'. Fix the initial queue configuration such that it wouldn't need to be fixed by try_fmt. Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/ti-vpe')
-rw-r--r--drivers/media/platform/ti-vpe/vpe.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
index 4511921421e2..dfed704ac375 100644
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -1870,9 +1870,11 @@ static int vpe_open(struct file *file)
1870 s_q_data->fmt = &vpe_formats[2]; 1870 s_q_data->fmt = &vpe_formats[2];
1871 s_q_data->width = 1920; 1871 s_q_data->width = 1920;
1872 s_q_data->height = 1080; 1872 s_q_data->height = 1080;
1873 s_q_data->sizeimage[VPE_LUMA] = (s_q_data->width * s_q_data->height * 1873 s_q_data->bytesperline[VPE_LUMA] = (s_q_data->width *
1874 s_q_data->fmt->vpdma_fmt[VPE_LUMA]->depth) >> 3; 1874 s_q_data->fmt->vpdma_fmt[VPE_LUMA]->depth) >> 3;
1875 s_q_data->colorspace = V4L2_COLORSPACE_SMPTE170M; 1875 s_q_data->sizeimage[VPE_LUMA] = (s_q_data->bytesperline[VPE_LUMA] *
1876 s_q_data->height);
1877 s_q_data->colorspace = V4L2_COLORSPACE_REC709;
1876 s_q_data->field = V4L2_FIELD_NONE; 1878 s_q_data->field = V4L2_FIELD_NONE;
1877 s_q_data->c_rect.left = 0; 1879 s_q_data->c_rect.left = 0;
1878 s_q_data->c_rect.top = 0; 1880 s_q_data->c_rect.top = 0;