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

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

Merge "[media] v4l: Remove V4L2_BUF_FLAG_EOS"

parents 453aea79 b1fcdbb5

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -849,7 +849,7 @@ static void handle_fbd(enum command_response cmd, void *data) 
		vb->v4l2_buf.flags = 0;

		vb->v4l2_buf.flags = 0;





		if (fill_buf_done->flags1 & HAL_BUFFERFLAG_EOS)

		if (fill_buf_done->flags1 & HAL_BUFFERFLAG_EOS)

			vb->v4l2_buf.flags |= V4L2_BUF_FLAG_EOS;

			vb->v4l2_buf.flags |= V4L2_QCOM_BUF_FLAG_EOS;

		if (fill_buf_done->flags1 & HAL_BUFFERFLAG_CODECCONFIG)

		if (fill_buf_done->flags1 & HAL_BUFFERFLAG_CODECCONFIG)

			vb->v4l2_buf.flags &= ~V4L2_QCOM_BUF_FLAG_CODECCONFIG;

			vb->v4l2_buf.flags &= ~V4L2_QCOM_BUF_FLAG_CODECCONFIG;

		if (fill_buf_done->flags1 & HAL_BUFFERFLAG_SYNCFRAME)

		if (fill_buf_done->flags1 & HAL_BUFFERFLAG_SYNCFRAME)
@@ -919,7 +919,7 @@ static void handle_fbd(enum command_response cmd, void *data) 
					struct vb2_buffer, queued_entry);

					struct vb2_buffer, queued_entry);

				vb->v4l2_planes[0].bytesused = 0;

				vb->v4l2_planes[0].bytesused = 0;

				vb->v4l2_planes[0].data_offset = 0;

				vb->v4l2_planes[0].data_offset = 0;

				vb->v4l2_buf.flags |= V4L2_BUF_FLAG_EOS;

				vb->v4l2_buf.flags |= V4L2_QCOM_BUF_FLAG_EOS;

				mutex_lock(&q->lock);

				mutex_lock(&q->lock);

				vb2_buffer_done(vb, VB2_BUF_STATE_DONE);

				vb2_buffer_done(vb, VB2_BUF_STATE_DONE);

				mutex_unlock(&q->lock);

				mutex_unlock(&q->lock);
@@ -1995,7 +1995,7 @@ int msm_comm_qbuf(struct vb2_buffer *vb) 
		}

		}

		if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {

		if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {

			frame_data.buffer_type = HAL_BUFFER_INPUT;

			frame_data.buffer_type = HAL_BUFFER_INPUT;

			if (vb->v4l2_buf.flags & V4L2_BUF_FLAG_EOS) {

			if (vb->v4l2_buf.flags & V4L2_QCOM_BUF_FLAG_EOS) {

				frame_data.flags |= HAL_BUFFERFLAG_EOS;

				frame_data.flags |= HAL_BUFFERFLAG_EOS;

				dprintk(VIDC_DBG,

				dprintk(VIDC_DBG,

					"Received EOS on output capability\n");

					"Received EOS on output capability\n");

include/uapi/linux/videodev2.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -694,7 +694,6 @@ struct v4l2_buffer { 
/* Cache handling flags */

/* Cache handling flags */

#define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE	0x0800

#define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE	0x0800

#define V4L2_BUF_FLAG_NO_CACHE_CLEAN		0x1000

#define V4L2_BUF_FLAG_NO_CACHE_CLEAN		0x1000

#define V4L2_BUF_FLAG_EOS			0x2000

/* Timestamp type */

/* Timestamp type */

#define V4L2_BUF_FLAG_TIMESTAMP_MASK		0xe000

#define V4L2_BUF_FLAG_TIMESTAMP_MASK		0xe000

#define V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN		0x0000

#define V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN		0x0000
@@ -709,7 +708,7 @@ struct v4l2_buffer { 
#define V4L2_QCOM_BUF_DATA_CORRUPT		0x200000

#define V4L2_QCOM_BUF_DATA_CORRUPT		0x200000

#define V4L2_QCOM_BUF_DROP_FRAME		0x400000

#define V4L2_QCOM_BUF_DROP_FRAME		0x400000

#define V4L2_QCOM_BUF_INPUT_UNSUPPORTED		0x800000

#define V4L2_QCOM_BUF_INPUT_UNSUPPORTED		0x800000

#define V4L2_QCOM_BUF_FLAG_EOS			0x2000

#define V4L2_QCOM_BUF_FLAG_EOS			0x1000000





/**

/**

 * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor

 * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor