OSDN Git Service

media: coda: Simplify H.264 small buffer padding logic
authorEzequiel Garcia <ezequiel@collabora.com>
Wed, 7 Oct 2020 10:35:40 +0000 (12:35 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 16 Nov 2020 09:31:09 +0000 (10:31 +0100)
The H.264 small buffer padding is done under
the (ctx->qsequence == 0 && payload < 512) condition.

Given this is the exact same condition immediately
above, we can move it right there, making the code
slightly clearer.

This change shouldn't affect functionality as it's just
cosmetics.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/coda/coda-bit.c

index aa0a47c..659fcf7 100644 (file)
@@ -293,12 +293,11 @@ static bool coda_bitstream_try_queue(struct coda_ctx *ctx,
                        coda_dbg(1, ctx,
                                 "could not parse header, sequence initialization might fail\n");
                }
-       }
 
-       /* Add padding before the first buffer, if it is too small */
-       if (ctx->qsequence == 0 && payload < 512 &&
-           ctx->codec->src_fourcc == V4L2_PIX_FMT_H264)
-               coda_h264_bitstream_pad(ctx, 512 - payload);
+               /* Add padding before the first buffer, if it is too small */
+               if (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264)
+                       coda_h264_bitstream_pad(ctx, 512 - payload);
+       }
 
        ret = coda_bitstream_queue(ctx, vaddr, payload);
        if (ret < 0) {