Skip to content

Commit

Permalink
hantro: h264: Rename scaling list handling function
Browse files Browse the repository at this point in the history
Commit e17f08e ("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 <[email protected]>
Reviewed-by: Philipp Zabel <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
ezequielgarcia authored and sigmaris committed Aug 8, 2020
1 parent 7fe3b67 commit 745cdf9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/media/hantro/hantro_h264.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 745cdf9

Please sign in to comment.