Commit 0875962a authored by Jonas Karlman's avatar Jonas Karlman Committed by Mauro Carvalho Chehab
Browse files

media: hantro: Remove now unused H264 pic_size 



pic_size in hantro_h264_dec_hw_ctx struct is no longer used,
lets remove it.

Signed-off-by: default avatarJonas Karlman <jonas@kwiboo.se>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 79c52329

drivers/staging/media/hantro/hantro_h264.c

+0 −5
Original line number Diff line number Diff line
@@ -618,7 +618,6 @@ int hantro_h264_dec_init(struct hantro_ctx *ctx) 
	struct hantro_h264_dec_hw_ctx *h264_dec = &ctx->h264_dec;

	struct hantro_aux_buf *priv = &h264_dec->priv;

	struct hantro_h264_dec_priv_tbl *tbl;

	struct v4l2_pix_format_mplane pix_mp;



	priv->cpu = dma_alloc_coherent(vpu->dev, sizeof(*tbl), &priv->dma,

				       GFP_KERNEL);
@@ -629,9 +628,5 @@ int hantro_h264_dec_init(struct hantro_ctx *ctx) 
	tbl = priv->cpu;

	memcpy(tbl->cabac_table, h264_cabac_table, sizeof(tbl->cabac_table));



	v4l2_fill_pixfmt_mp(&pix_mp, ctx->dst_fmt.pixelformat,

			    ctx->dst_fmt.width, ctx->dst_fmt.height);

	h264_dec->pic_size = pix_mp.plane_fmt[0].sizeimage;



	return 0;

}

drivers/staging/media/hantro/hantro_hw.h

+0 −3
Original line number Diff line number Diff line
@@ -80,15 +80,12 @@ struct hantro_h264_dec_reflists { 
 * @dpb:	DPB

 * @reflists:	P/B0/B1 reflists

 * @ctrls:	V4L2 controls attached to a run

 * @pic_size:	Size in bytes of decoded picture, this is needed

 *		to pass the location of motion vectors.

 */

struct hantro_h264_dec_hw_ctx {

	struct hantro_aux_buf priv;

	struct v4l2_h264_dpb_entry dpb[HANTRO_H264_DPB_SIZE];

	struct hantro_h264_dec_reflists reflists;

	struct hantro_h264_dec_ctrls ctrls;

	size_t pic_size;

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE