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

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

Merge "msm: vidc: Use correct flag to propagate data corruption"

parents 350057ab 2c4ddc1c

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

+2 −2
Original line number Diff line number Diff line
@@ -2501,7 +2501,7 @@ static void handle_ebd(enum hal_command_response cmd, void *data) 
	}

	if (empty_buf_done->status == VIDC_ERR_BITSTREAM_ERR) {

		dprintk(VIDC_INFO, "Failed : Corrupted input stream\n");

		mbuf->vvb.flags |= V4L2_QCOM_BUF_DATA_CORRUPT;

		mbuf->vvb.flags |= V4L2_BUF_FLAG_DATA_CORRUPT;

	}

	if (empty_buf_done->flags & HAL_BUFFERFLAG_SYNCFRAME)

		mbuf->vvb.flags |= V4L2_BUF_FLAG_KEYFRAME;
@@ -2681,7 +2681,7 @@ static void handle_fbd(enum hal_command_response cmd, void *data) 
	if (fill_buf_done->flags1 & HAL_BUFFERFLAG_SYNCFRAME)

		mbuf->vvb.flags |= V4L2_BUF_FLAG_KEYFRAME;

	if (fill_buf_done->flags1 & HAL_BUFFERFLAG_DATACORRUPT)

		mbuf->vvb.flags |= V4L2_QCOM_BUF_DATA_CORRUPT;

		mbuf->vvb.flags |= V4L2_BUF_FLAG_DATA_CORRUPT;

	switch (fill_buf_done->picture_type) {

	case HAL_PICTURE_IDR:

	case HAL_PICTURE_I:

include/uapi/linux/videodev2.h

+1 −0
Original line number Diff line number Diff line
@@ -1054,6 +1054,7 @@ struct v4l2_buffer { 
/* Vendor extensions */

#define V4L2_QCOM_BUF_FLAG_CODECCONFIG		0x00020000

#define V4L2_QCOM_BUF_DATA_CORRUPT		0x00400000

#define V4L2_BUF_FLAG_DATA_CORRUPT		0x00400000

#define V4L2_QCOM_BUF_INPUT_UNSUPPORTED		0x01000000

#define V4L2_QCOM_BUF_FLAG_EOS			0x02000000

#define V4L2_QCOM_BUF_FLAG_READONLY		0x04000000