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

Commit 26bc4b96 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: EOS not reached for specific AV content"

parents 6c26db60 e3abf4d0

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

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
				break;



			rc = msm_comm_set_buffer_count(inst,

				bufreq_out2->buffer_count_min_host,

				bufreq_out2->buffer_count_min,

				bufreq_out2->buffer_count_actual,

				HAL_BUFFER_OUTPUT2);

			if (rc) {

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

+2 −2
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ static int msm_vidc_queue_setup(struct vb2_queue *q, 


		bufreq->buffer_count_actual = *num_buffers;

		rc = msm_comm_set_buffer_count(inst,

			bufreq->buffer_count_min_host,

			bufreq->buffer_count_min,

			bufreq->buffer_count_actual, HAL_BUFFER_INPUT);

		}

		break;
@@ -811,7 +811,7 @@ static int msm_vidc_queue_setup(struct vb2_queue *q, 


		bufreq->buffer_count_actual = *num_buffers;

		rc = msm_comm_set_buffer_count(inst,

			bufreq->buffer_count_min_host,

			bufreq->buffer_count_min,

			bufreq->buffer_count_actual, buffer_type);

		}

		break;

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

+2 −2
Original line number Diff line number Diff line
@@ -3196,7 +3196,7 @@ static int msm_comm_init_buffer_count(struct msm_vidc_inst *inst) 
		bufreq->buffer_count_actual);



	rc = msm_comm_set_buffer_count(inst,

			bufreq->buffer_count_min_host,

			bufreq->buffer_count_min,

			bufreq->buffer_count_actual, HAL_BUFFER_INPUT);

	if (rc) {

		dprintk(VIDC_ERR,
@@ -3230,7 +3230,7 @@ static int msm_comm_init_buffer_count(struct msm_vidc_inst *inst) 
		bufreq->buffer_count_actual);



	rc = msm_comm_set_buffer_count(inst,

		bufreq->buffer_count_min_host,

		bufreq->buffer_count_min,

		bufreq->buffer_count_actual, HAL_BUFFER_OUTPUT);

	if (rc) {

		dprintk(VIDC_ERR,