Merge "video: driver: Update interlace metadata UAPI"

driver/vidc/src/msm_vidc_driver.c

@@ -1452,8 +1452,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;
 	}
 

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 */