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

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

Merge "msm: vidc: Use data corrupt flag instead of error flag"

parents 49c9f0d1 e1e94642

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

+2 −2
Original line number Diff line number Diff line
@@ -2455,7 +2455,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_BUF_FLAG_ERROR;

		mbuf->vvb.flags |= V4L2_QCOM_BUF_DATA_CORRUPT;

	}

	if (empty_buf_done->flags & HAL_BUFFERFLAG_SYNCFRAME)

		mbuf->vvb.flags |= V4L2_BUF_FLAG_KEYFRAME;
@@ -2635,7 +2635,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_BUF_FLAG_ERROR;

		mbuf->vvb.flags |= V4L2_QCOM_BUF_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
@@ -1050,6 +1050,7 @@ struct v4l2_buffer { 
#define V4L2_BUF_FLAG_LAST			0x00100000

/* Vendor extensions */

#define V4L2_QCOM_BUF_FLAG_CODECCONFIG		0x00020000

#define V4L2_QCOM_BUF_DATA_CORRUPT		0x00400000

#define V4L2_QCOM_BUF_INPUT_UNSUPPORTED		0x01000000

#define V4L2_QCOM_BUF_FLAG_EOS			0x02000000

#define V4L2_QCOM_BUF_FLAG_READONLY		0x04000000