From 59813f951dd528f3602adc7c738ba63216e052dc Mon Sep 17 00:00:00 2001 From: Mihir Ganu Date: Fri, 22 Jan 2021 17:06:18 -0800 Subject: [PATCH] video: driver: Update interlace metadata UAPI Update UAPI for interlace metadata and add better logging for metadata qbuf. Change-Id: Icd56872ffea7444a1b8f3c5c1bb61495552659b4 Signed-off-by: Mihir Ganu --- driver/vidc/src/msm_vidc_driver.c | 3 +-- include/uapi/vidc/media/v4l2_vidc_extensions.h | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/driver/vidc/src/msm_vidc_driver.c b/driver/vidc/src/msm_vidc_driver.c index 37b1918f9f..52d7c2c14c 100644 --- a/driver/vidc/src/msm_vidc_driver.c +++ b/driver/vidc/src/msm_vidc_driver.c @@ -1457,8 +1457,7 @@ int msm_vidc_queue_buffer(struct msm_vidc_inst *inst, struct vb2_buffer *vb2) if (buf->type == MSM_VIDC_BUF_INPUT_META || buf->type == MSM_VIDC_BUF_OUTPUT_META) { buf->attr |= MSM_VIDC_ATTR_DEFERRED; - s_vpr_l(inst->sid, "metabuf fd %3d daddr %#x deferred\n", - buf->fd, buf->device_addr); + print_vidc_buffer(VIDC_HIGH, "qbuf deferred", inst, buf); return 0; } diff --git a/include/uapi/vidc/media/v4l2_vidc_extensions.h b/include/uapi/vidc/media/v4l2_vidc_extensions.h index 3b6c4d751e..be3c7293e0 100644 --- a/include/uapi/vidc/media/v4l2_vidc_extensions.h +++ b/include/uapi/vidc/media/v4l2_vidc_extensions.h @@ -153,6 +153,15 @@ enum v4l2_mpeg_vidc_metadata { METADATA_ENC_QP_METADATA = 0x0300016e, METADATA_ROI_INFO = 0x03000173, }; +enum meta_interlace_info { + META_INTERLACE_INFO_NONE = 0x00000000, + META_INTERLACE_FRAME_PROGRESSIVE = 0x00000001, + META_INTERLACE_FRAME_MBAFF = 0x00000002, + META_INTERLACE_FRAME_INTERLEAVE_TOPFIELD_FIRST = 0x00000004, + META_INTERLACE_FRAME_INTERLEAVE_BOTTOMFIELD_FIRST = 0x00000008, + META_INTERLACE_FRAME_INTERLACE_TOPFIELD_FIRST = 0x00000010, + META_INTERLACE_FRAME_INTERLACE_BOTTOMFIELD_FIRST = 0x00000020, +}; /* vendor controls end */