UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Jonas Karlman 2019-11-06 23:35:10 +01:00 committed by Mauro Carvalho Chehab
parent 79c523291e
commit 0875962af4
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/media/hantro/hantro_h264.c
View File

@ -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_h264_dec_hw_ctx *h264_dec = &ctx->h264_dec;
struct hantro_aux_buf *priv = &h264_dec->priv; struct hantro_aux_buf *priv = &h264_dec->priv;
struct hantro_h264_dec_priv_tbl *tbl; 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, priv->cpu = dma_alloc_coherent(vpu->dev, sizeof(*tbl), &priv->dma,
GFP_KERNEL); GFP_KERNEL);
@ -629,9 +628,5 @@ int hantro_h264_dec_init(struct hantro_ctx *ctx)
tbl = priv->cpu; tbl = priv->cpu;
memcpy(tbl->cabac_table, h264_cabac_table, sizeof(tbl->cabac_table)); 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; return 0;
} }

3
drivers/staging/media/hantro/hantro_hw.h
View File

@ -80,15 +80,12 @@ struct hantro_h264_dec_reflists {
* @dpb: DPB * @dpb: DPB
* @reflists: P/B0/B1 reflists * @reflists: P/B0/B1 reflists
* @ctrls: V4L2 controls attached to a run * @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_h264_dec_hw_ctx {
struct hantro_aux_buf priv; struct hantro_aux_buf priv;
struct v4l2_h264_dpb_entry dpb[HANTRO_H264_DPB_SIZE]; struct v4l2_h264_dpb_entry dpb[HANTRO_H264_DPB_SIZE];
struct hantro_h264_dec_reflists reflists; struct hantro_h264_dec_reflists reflists;
struct hantro_h264_dec_ctrls ctrls; struct hantro_h264_dec_ctrls ctrls;
size_t pic_size;
}; };
/** /**