]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
hantro: h264: Rename scaling list handling function
authorEzequiel Garcia <ezequiel@collabora.com>
Wed, 1 Jul 2020 13:16:03 +0000 (15:16 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Sun, 19 Jul 2020 11:24:37 +0000 (13:24 +0200)
Commit e17f08e31666 ("media: hantro: Do not reorder
H264 scaling list") removed the scaling list reordering,
which was wrong and not needed.

However, the name of the function stayed, which is
confusing for anyone reading the code. Rename
from "reorder" to "assemble" which is cleaner.

This is just a cosmetic cleanup.

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/staging/media/hantro/hantro_h264.c

index dd935d7009bf1e5483220afd8ebebd1e33d5ec42..194d058480777b6e13ba8c4b69678cac7df48cf2 100644 (file)
@@ -193,7 +193,7 @@ static const u32 h264_cabac_table[] = {
 };
 
 static void
-reorder_scaling_list(struct hantro_ctx *ctx)
+assemble_scaling_list(struct hantro_ctx *ctx)
 {
        const struct hantro_h264_dec_ctrls *ctrls = &ctx->h264_dec.ctrls;
        const struct v4l2_ctrl_h264_scaling_matrix *scaling = ctrls->scaling;
@@ -235,7 +235,7 @@ static void prepare_table(struct hantro_ctx *ctx)
        tbl->poc[32] = dec_param->top_field_order_cnt;
        tbl->poc[33] = dec_param->bottom_field_order_cnt;
 
-       reorder_scaling_list(ctx);
+       assemble_scaling_list(ctx);
 }
 
 static bool dpb_entry_match(const struct v4l2_h264_dpb_entry *a,