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

Commit 738a33a4 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: Add support 601-709 color space conversion"

parents 9b66e995 92114e05

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

+7 −1
Original line number Diff line number Diff line
@@ -2456,7 +2456,13 @@ int msm_comm_qbuf(struct vb2_buffer *vb) 
				dprintk(VIDC_DBG,

					"Received EOS on output capability\n");

			}



			if (vb->v4l2_buf.flags &

				V4L2_MSM_BUF_FLAG_YUV_601_709_CLAMP) {

				frame_data.flags |=

					HAL_BUFFERFLAG_YUV_601_709_CSC_CLAMP;

				dprintk(VIDC_DBG,

					"Received buff with 601to709 clamp\n");

			}

			if (vb->v4l2_buf.flags &

					V4L2_QCOM_BUF_FLAG_CODECCONFIG) {

				frame_data.flags |= HAL_BUFFERFLAG_CODECCONFIG;

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define HAL_BUFFERFLAG_READONLY         0x00000200

#define HAL_BUFFERFLAG_ENDOFSUBFRAME    0x00000400

#define HAL_BUFFERFLAG_EOSEQ            0x00200000

#define HAL_BUFFERFLAG_YUV_601_709_CSC_CLAMP   0x10000000

#define HAL_BUFFERFLAG_DROP_FRAME       0x20000000

#define HAL_BUFFERFLAG_TS_DISCONTINUITY	0x40000000

#define HAL_BUFFERFLAG_TS_ERROR		0x80000000

include/uapi/linux/videodev2.h

+1 −0
Original line number Diff line number Diff line
@@ -714,6 +714,7 @@ struct v4l2_buffer { 
#define V4L2_QCOM_BUF_TS_ERROR			0x4000000

#define V4L2_QCOM_BUF_FLAG_READONLY		0x8000000

#define V4L2_MSM_VIDC_BUF_START_CODE_NOT_FOUND	0x10000000

#define V4L2_MSM_BUF_FLAG_YUV_601_709_CLAMP	0x20000000



/**

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