lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: vidc: Revert of 2735098"

Browse Source
This commit is contained in:
qctecmdr 2019-05-25 08:49:36 -07:00 committed by Gerrit - the friendly Code Review server
commit 7c7796087e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
msm/vidc/msm_vdec.c
View File

@ -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));