Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52237305 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Fix buffer counts for split mode"

parents 154094f0 86c7c240

drivers/media/platform/msm/vidc/msm_vdec.c

+2 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,7 @@ int msm_vdec_s_ext_ctrl(struct msm_vidc_inst *inst, 
				dprintk(VIDC_ERR,

					"%s Failed setting stream output mode : %d\n",

					__func__, rc);

			rc = msm_vidc_update_host_buff_counts(inst);

			break;

		case V4L2_CID_MPEG_VIDC_VIDEO_DPB_COLOR_FORMAT:

			control.id =
@@ -1154,6 +1155,7 @@ int msm_vdec_s_ext_ctrl(struct msm_vidc_inst *inst, 
						break;

					}

				}

				rc = msm_vidc_update_host_buff_counts(inst);

				inst->clk_data.dpb_fourcc = fourcc;

				break;

			default:

drivers/media/platform/msm/vidc/msm_vidc_common.c

+5 −0
Original line number Diff line number Diff line
@@ -3182,6 +3182,11 @@ static int set_output_buffers(struct msm_vidc_inst *inst, 
			buffer_type);

		return 0;

	}



	/* For DPB buffers, Always use FW count */

	output_buf->buffer_count_actual = output_buf->buffer_count_min_host =

		output_buf->buffer_count_min;



	dprintk(VIDC_DBG,

		"output: num = %d, size = %d\n",

		output_buf->buffer_count_actual,