From 7a43aa6b189668e2706480be19ab24311b21dd4a Mon Sep 17 00:00:00 2001 From: Darshana Patil Date: Tue, 25 Jun 2019 11:28:27 -0700 Subject: [PATCH] msm: vidc: fix encoder internal buffer size Fixed all encoder internal buffer size calculation based on bitstream buffer size. Change-Id: Ib4bdf89f356877acd151d2d0a5a7ca8901421a84 Signed-off-by: Darshana Patil --- msm/vidc/msm_vidc_buffer_calculations.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msm/vidc/msm_vidc_buffer_calculations.c b/msm/vidc/msm_vidc_buffer_calculations.c index 1e0fed51998c..9735d44c5004 100644 --- a/msm/vidc/msm_vidc_buffer_calculations.c +++ b/msm/vidc/msm_vidc_buffer_calculations.c @@ -509,7 +509,7 @@ int msm_vidc_get_encoder_internal_buffer_sizes(struct msm_vidc_inst *inst) return -EINVAL; } - f = &inst->fmts[INPUT_PORT].v4l2_fmt; + f = &inst->fmts[OUTPUT_PORT].v4l2_fmt; width = f->fmt.pix_mp.width; height = f->fmt.pix_mp.height; bframe = get_ctrl(inst, V4L2_CID_MPEG_VIDEO_B_FRAMES); @@ -1512,10 +1512,10 @@ static inline u32 calculate_enc_scratch1_size(struct msm_vidc_inst *inst, (VENUS_DMA_ALIGNMENT + 16 * (width_coded >> 4)); topline_buf_ctrl_size_FE = ALIGN(topline_buf_ctrl_size_FE, VENUS_DMA_ALIGNMENT); - leftline_buf_ctrl_size_FE = ((VENUS_DMA_ALIGNMENT + 64 * + leftline_buf_ctrl_size_FE = (((VENUS_DMA_ALIGNMENT + 64 * (height_coded >> 4)) + (VENUS_DMA_ALIGNMENT << (num_vpp_pipes - 1)) - 1) & - (~((VENUS_DMA_ALIGNMENT << (num_vpp_pipes - 1)) - 1)) * + (~((VENUS_DMA_ALIGNMENT << (num_vpp_pipes - 1)) - 1)) * 1) * num_vpp_pipes; leftline_buf_meta_recony = ((VENUS_DMA_ALIGNMENT + 64 * ((height_coded) / (8 * (ten_bit ? 4 : 8)))) * num_vpp_pipes);