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

Commit c1ca430b 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: Use EOS flag instead of FLAG_LAST"

parents 5a622055 757fd630

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

+2 −2
Original line number Diff line number Diff line
@@ -2596,7 +2596,7 @@ static void handle_fbd(enum hal_command_response cmd, void *data) 
	if (fill_buf_done->flags1 & HAL_BUFFERFLAG_READONLY)

		mbuf->vvb.flags |= V4L2_QCOM_BUF_FLAG_READONLY;

	if (fill_buf_done->flags1 & HAL_BUFFERFLAG_EOS)

		mbuf->vvb.flags |= V4L2_BUF_FLAG_LAST;

		mbuf->vvb.flags |= V4L2_QCOM_BUF_FLAG_EOS;

	if (fill_buf_done->flags1 & HAL_BUFFERFLAG_CODECCONFIG)

		mbuf->vvb.flags |= V4L2_QCOM_BUF_FLAG_CODECCONFIG;

	if (fill_buf_done->flags1 & HAL_BUFFERFLAG_SYNCFRAME)
@@ -3953,7 +3953,7 @@ static void populate_frame_data(struct vidc_frame_data *data, 
		data->filled_len = vb->planes[0].bytesused;

		data->offset = vb->planes[0].data_offset;



		if (vbuf->flags & V4L2_BUF_FLAG_LAST)

		if (vbuf->flags & V4L2_QCOM_BUF_FLAG_EOS)

			data->flags |= HAL_BUFFERFLAG_EOS;



		if (vbuf->flags & V4L2_QCOM_BUF_FLAG_CODECCONFIG)

include/uapi/linux/videodev2.h

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

#define V4L2_QCOM_BUF_FLAG_CODECCONFIG		0x00020000

#define V4L2_QCOM_BUF_INPUT_UNSUPPORTED		0x01000000

#define V4L2_QCOM_BUF_FLAG_EOS			0x02000000

#define V4L2_QCOM_BUF_FLAG_READONLY		0x04000000

#define V4L2_QCOM_BUF_FLAG_PERF_MODE		0x20000000