mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

media: rkvdec: Fix H264 scaling list order

Browse source 
The Rockchip Video Decoder driver is expecting that the values in a
scaling list are in zig-zag order and applies the inverse scanning process
to get the values in matrix order.

Commit 0b0393d59e ("media: uapi: h264: clarify expected
scaling_list_4x4/8x8 order") clarified that the values in the scaling list
should already be in matrix order.

Fix this by removing the reordering and change to use two memcpy.

Fixes: cd33c83044 ("media: rkvdec: Add the rkvdec driver")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Tested-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
[hverkuil-cisco@xs4all.nl: rkvdec_scaling_matrix -> rkvdec_h264_scaling_list]
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Jonas Karlman 2020-05-22 22:21:33 +02:00 committed by Mauro Carvalho Chehab
parent 88441917dc
commit 2630e1bb09
1 changed files with 20 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
drivers/staging/media/rkvdec/rkvdec-h264.c
View file

@ -18,11 +18,16 @@
/* Size with u32 units. */ /* Size with u32 units. */
#define RKV_CABAC_INIT_BUFFER_SIZE (3680 + 128) #define RKV_CABAC_INIT_BUFFER_SIZE (3680 + 128)
#define RKV_RPS_SIZE ((128 + 128) / 4) #define RKV_RPS_SIZE ((128 + 128) / 4)
#define RKV_SCALING_LIST_SIZE (6 * 16 + 6 * 64 + 128)
#define RKV_ERROR_INFO_SIZE (256 * 144 * 4) #define RKV_ERROR_INFO_SIZE (256 * 144 * 4)
#define RKVDEC_NUM_REFLIST 3 #define RKVDEC_NUM_REFLIST 3
struct rkvdec_h264_scaling_list {
u8 scaling_list_4x4[6][16];
u8 scaling_list_8x8[6][64];
u8 padding[128];
};
struct rkvdec_sps_pps_packet { struct rkvdec_sps_pps_packet {
u32 info[8]; u32 info[8];
}; };
@ -86,7 +91,7 @@ struct rkvdec_ps_field {
/* Data structure describing auxiliary buffer format. */ /* Data structure describing auxiliary buffer format. */
struct rkvdec_h264_priv_tbl { struct rkvdec_h264_priv_tbl {
s8 cabac_table[4][464][2]; s8 cabac_table[4][464][2];
u8 scaling_list[RKV_SCALING_LIST_SIZE]; struct rkvdec_h264_scaling_list scaling_list;
u32 rps[RKV_RPS_SIZE]; u32 rps[RKV_RPS_SIZE];
struct rkvdec_sps_pps_packet param_set[256]; struct rkvdec_sps_pps_packet param_set[256];
u8 err_info[RKV_ERROR_INFO_SIZE]; u8 err_info[RKV_ERROR_INFO_SIZE];
@ -785,56 +790,25 @@ static void assemble_hw_rps(struct rkvdec_ctx *ctx,
} }
} }
/* static void assemble_hw_scaling_list(struct rkvdec_ctx *ctx,
* NOTE: The values in a scaling list are in zig-zag order, apply inverse struct rkvdec_h264_run *run)
* scanning process to get the values in matrix order.
*/
static const u32 zig_zag_4x4[16] = {
0, 1, 4, 8, 5, 2, 3, 6, 9, 12, 13, 10, 7, 11, 14, 15
};
static const u32 zig_zag_8x8[64] = {
0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5,
12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28,
35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51,
58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63
};
static void reorder_scaling_list(struct rkvdec_ctx *ctx,
struct rkvdec_h264_run *run)
{ {
const struct v4l2_ctrl_h264_scaling_matrix *scaling = run->scaling_matrix; const struct v4l2_ctrl_h264_scaling_matrix *scaling = run->scaling_matrix;
const size_t num_list_4x4 = ARRAY_SIZE(scaling->scaling_list_4x4);
const size_t list_len_4x4 = ARRAY_SIZE(scaling->scaling_list_4x4[0]);
const size_t num_list_8x8 = ARRAY_SIZE(scaling->scaling_list_8x8);
const size_t list_len_8x8 = ARRAY_SIZE(scaling->scaling_list_8x8[0]);
struct rkvdec_h264_ctx *h264_ctx = ctx->priv; struct rkvdec_h264_ctx *h264_ctx = ctx->priv;
struct rkvdec_h264_priv_tbl *tbl = h264_ctx->priv_tbl.cpu; struct rkvdec_h264_priv_tbl *tbl = h264_ctx->priv_tbl.cpu;
u8 *dst = tbl->scaling_list;
const u8 *src;
int i, j;
BUILD_BUG_ON(ARRAY_SIZE(zig_zag_4x4) != list_len_4x4); BUILD_BUG_ON(sizeof(tbl->scaling_list.scaling_list_4x4) !=
BUILD_BUG_ON(ARRAY_SIZE(zig_zag_8x8) != list_len_8x8); sizeof(scaling->scaling_list_4x4));
BUILD_BUG_ON(ARRAY_SIZE(tbl->scaling_list) < BUILD_BUG_ON(sizeof(tbl->scaling_list.scaling_list_8x8) !=
num_list_4x4 * list_len_4x4 + sizeof(scaling->scaling_list_8x8));
num_list_8x8 * list_len_8x8);
src = &scaling->scaling_list_4x4[0][0]; memcpy(tbl->scaling_list.scaling_list_4x4,
for (i = 0; i < num_list_4x4; ++i) { scaling->scaling_list_4x4,
for (j = 0; j < list_len_4x4; ++j) sizeof(scaling->scaling_list_4x4));
dst[zig_zag_4x4[j]] = src[j];
src += list_len_4x4;
dst += list_len_4x4;
}
src = &scaling->scaling_list_8x8[0][0]; memcpy(tbl->scaling_list.scaling_list_8x8,
for (i = 0; i < num_list_8x8; ++i) { scaling->scaling_list_8x8,
for (j = 0; j < list_len_8x8; ++j) sizeof(scaling->scaling_list_8x8));
dst[zig_zag_8x8[j]] = src[j];
src += list_len_8x8;
dst += list_len_8x8;
}
} }
/* /*
@ -1126,7 +1100,7 @@ static int rkvdec_h264_run(struct rkvdec_ctx *ctx)
v4l2_h264_build_b_ref_lists(&reflist_builder, h264_ctx->reflists.b0, v4l2_h264_build_b_ref_lists(&reflist_builder, h264_ctx->reflists.b0,
h264_ctx->reflists.b1); h264_ctx->reflists.b1);
reorder_scaling_list(ctx, &run); assemble_hw_scaling_list(ctx, &run);
assemble_hw_pps(ctx, &run); assemble_hw_pps(ctx, &run);
assemble_hw_rps(ctx, &run); assemble_hw_rps(ctx, &run);
config_registers(ctx, &run); config_registers(ctx, &run);