Commit 2b0ec900 authored by Detlev Casanova's avatar Detlev Casanova Committed by Hans Verkuil
Browse files

media: rkvdec: Move cabac tables to their own source file 



This is in preparation to add support for new variants that will use the
same tables.

Tested-by: Diederik de Haas <didi.debian@cknow.org>  # Rock 5B
Reviewed-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarDetlev Casanova <detlev.casanova@collabora.com>
Signed-off-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent dc689898

drivers/media/platform/rockchip/rkvdec/Makefile

+6 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rockchip-vdec.o



rockchip-vdec-y += rkvdec.o rkvdec-h264.o rkvdec-hevc.o rkvdec-vp9.o
 
rockchip-vdec-y += \

		   rkvdec.o \

		   rkvdec-cabac.o \

		   rkvdec-h264.o \

		   rkvdec-hevc.o \

		   rkvdec-vp9.o

drivers/media/platform/rockchip/rkvdec/rkvdec-cabac.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Rockchip Video Decoder CABAC tables

 *

 * Copyright (C) 2023 Collabora, Ltd.

 *	Sebastian Fricke <sebastian.fricke@collabora.com>

 * Copyright (C) 2019 Collabora, Ltd.

 *	Boris Brezillon <boris.brezillon@collabora.com>

 */



#ifndef RKVDEC_CABAC_H_

#define RKVDEC_CABAC_H_



#include <linux/types.h>



#define RKV_HEVC_CABAC_TABLE_SIZE		27456



extern const s8 rkvdec_h264_cabac_table[4][464][2];

extern const u8 rkvdec_hevc_cabac_table[RKV_HEVC_CABAC_TABLE_SIZE];



#endif /* RKVDEC_CABAC_H_ */

drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c

+1 −499

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include "rkvdec.h"

#include "rkvdec-regs.h"

#include "rkvdec-hevc-data.c"

#include "rkvdec-cabac.h"



/* Size in u8/u32 units. */

#define RKV_SCALING_LIST_SIZE		1360
@@ -110,7 +110,7 @@ struct rkvdec_ps_field { 


/* Data structure describing auxiliary buffer format. */

struct rkvdec_hevc_priv_tbl {

	u8 cabac_table[RKV_CABAC_TABLE_SIZE];

	u8 cabac_table[RKV_HEVC_CABAC_TABLE_SIZE];

	u8 scaling_list[RKV_SCALING_LIST_SIZE];

	struct rkvdec_sps_pps_packet param_set[RKV_PPS_LEN];

	struct rkvdec_rps_packet rps[RKV_RPS_LEN];