Commit d9967fa3 authored by Wangao Wang's avatar Wangao Wang Committed by Hans Verkuil
Browse files

media: qcom: iris: Improve format alignment for encoder 



Add members enc_raw_width, enc_raw_height to the struct iris_inst to
support codec alignment requirements.

HFI_PROP_RAW_RESOLUTION needs to be set to the actual YUV resolution.

Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarDikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-HDK
Signed-off-by: default avatarWangao Wang <wangao.wang@oss.qualcomm.com>
Signed-off-by: default avatarBryan O'Donoghue <bod@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 9adfb1ba

drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c

+1 −2
Original line number Diff line number Diff line
@@ -170,8 +170,7 @@ static int iris_hfi_gen2_session_set_property(struct iris_inst *inst, u32 packet 


static int iris_hfi_gen2_set_raw_resolution(struct iris_inst *inst, u32 plane)

{

	u32 resolution = inst->fmt_src->fmt.pix_mp.width << 16 |

		inst->fmt_src->fmt.pix_mp.height;

	u32 resolution = inst->enc_raw_width << 16 | inst->enc_raw_height;

	u32 port = iris_hfi_gen2_get_port(inst, plane);



	return iris_hfi_gen2_session_set_property(inst,

drivers/media/platform/qcom/iris/iris_instance.h

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ struct iris_fmt { 
 * @frame_rate: frame rate of current instance

 * @operating_rate: operating rate of current instance

 * @hfi_rc_type: rate control type

 * @enc_raw_width: source image width for encoder instance

 * @enc_raw_height: source image height for encoder instance

 */



struct iris_inst {
@@ -108,6 +110,8 @@ struct iris_inst { 
	u32				frame_rate;

	u32				operating_rate;

	u32				hfi_rc_type;

	u32				enc_raw_width;

	u32				enc_raw_height;

};



#endif

drivers/media/platform/qcom/iris/iris_venc.c

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ int iris_venc_inst_init(struct iris_inst *inst) 
	inst->operating_rate = DEFAULT_FPS;

	inst->frame_rate = DEFAULT_FPS;



	inst->enc_raw_width = DEFAULT_WIDTH;

	inst->enc_raw_height = DEFAULT_HEIGHT;



	memcpy(&inst->fw_caps[0], &core->inst_fw_caps_enc[0],

	       INST_FW_CAP_MAX * sizeof(struct platform_inst_fw_cap));
@@ -287,6 +290,9 @@ static int iris_venc_s_fmt_input(struct iris_inst *inst, struct v4l2_format *f) 
	inst->buffers[BUF_INPUT].min_count = iris_vpu_buf_count(inst, BUF_INPUT);

	inst->buffers[BUF_INPUT].size = fmt->fmt.pix_mp.plane_fmt[0].sizeimage;



	inst->enc_raw_width = f->fmt.pix_mp.width;

	inst->enc_raw_height = f->fmt.pix_mp.height;



	if (f->fmt.pix_mp.width != inst->crop.width ||

	    f->fmt.pix_mp.height != inst->crop.height) {

		inst->crop.top = 0;