From d783a8038b476d6550fbf9f2b1ce57c1b2687e40 Mon Sep 17 00:00:00 2001 From: Shivendra Kakrania Date: Fri, 24 May 2019 22:12:37 -0700 Subject: [PATCH] msm: vidc: Revert of 2735098 Reverting 2735098 "update video dimensions during port reconfiguration". Change-Id: I2343cf77d23a564c3346d71dae9cd6377ae9d4e2 Signed-off-by: Shivendra Kakrania --- msm/vidc/msm_vdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/msm/vidc/msm_vdec.c b/msm/vidc/msm_vdec.c index cfe5f13784ce..cc6dc12d9617 100644 --- a/msm/vidc/msm_vdec.c +++ b/msm/vidc/msm_vdec.c @@ -662,10 +662,6 @@ int msm_vdec_g_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) if (f->type == OUTPUT_MPLANE) { fmt = &inst->fmts[OUTPUT_PORT].v4l2_fmt; - if (inst->in_reconfig) { - fmt->fmt.pix_mp.width = inst->reconfig_width; - fmt->fmt.pix_mp.height = inst->reconfig_height; - } fmt->fmt.pix_mp.plane_fmt[0].sizeimage = msm_vidc_calculate_dec_output_frame_size(inst); if (fmt->fmt.pix_mp.num_planes > 1) @@ -674,6 +670,10 @@ int msm_vdec_g_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) memcpy(f, fmt, sizeof(struct v4l2_format)); } else if (f->type == INPUT_MPLANE) { fmt = &inst->fmts[INPUT_PORT].v4l2_fmt; + if (inst->in_reconfig) { + fmt->fmt.pix_mp.width = inst->reconfig_width; + fmt->fmt.pix_mp.height = inst->reconfig_height; + } fmt->fmt.pix_mp.plane_fmt[0].sizeimage = msm_vidc_calculate_dec_input_frame_size(inst); memcpy(f, fmt, sizeof(struct v4l2_format));