From: Philipp Zabel Date: Fri, 11 Jul 2014 09:36:39 +0000 (-0300) Subject: [media] coda: increase frame stride to 16 for h.264 X-Git-Tag: v3.17-rc1~112^2~156 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=451dfe5d85cc5f5c6cb196dc9ebae4458a59dc21;p=karo-tx-linux.git [media] coda: increase frame stride to 16 for h.264 When encoding into h.264, the input frame stride needs to be a multiple of 16. During allocation of the input buffers, it may not be known yet whether the encoder should create h.264 or not. Assume the worst and always use a frame stride that is a multiple of 16. Signed-off-by: Philipp Zabel Signed-off-by: Kamil Debski Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index aa80020960cd..5ec6819634bf 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -685,8 +685,8 @@ static int coda_try_fmt(struct coda_ctx *ctx, struct coda_codec *codec, switch (f->fmt.pix.pixelformat) { case V4L2_PIX_FMT_YUV420: case V4L2_PIX_FMT_YVU420: - /* Frame stride must be multiple of 8 */ - f->fmt.pix.bytesperline = round_up(f->fmt.pix.width, 8); + /* Frame stride must be multiple of 8, but 16 for h.264 */ + f->fmt.pix.bytesperline = round_up(f->fmt.pix.width, 16); f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * f->fmt.pix.height * 3 / 2; break;