Commit 79c52329 authored by Jonas Karlman's avatar Jonas Karlman Committed by Mauro Carvalho Chehab
Browse files

media: hantro: Use output buffer width and height for H264 decoding 



Calculations for motion vector buffer offset is based on width and height
from the configured output format, lets use the same values for macroblock
width and height hw regs.

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 a8fe9960

drivers/staging/media/hantro/hantro_g1_h264_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ static void set_params(struct hantro_ctx *ctx) 
	vdpu_write_relaxed(vpu, reg, G1_REG_DEC_CTRL0);



	/* Decoder control register 1. */

	reg = G1_REG_DEC_CTRL1_PIC_MB_WIDTH(sps->pic_width_in_mbs_minus1 + 1) |

	      G1_REG_DEC_CTRL1_PIC_MB_HEIGHT_P(sps->pic_height_in_map_units_minus1 + 1) |

	reg = G1_REG_DEC_CTRL1_PIC_MB_WIDTH(MB_WIDTH(ctx->src_fmt.width)) |

	      G1_REG_DEC_CTRL1_PIC_MB_HEIGHT_P(MB_HEIGHT(ctx->src_fmt.height)) |

	      G1_REG_DEC_CTRL1_REF_FRAMES(sps->max_num_ref_frames);

	vdpu_write_relaxed(vpu, reg, G1_REG_DEC_CTRL1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE