diff --git a/driver/platform/common/inc/msm_vidc_platform_ext.h b/driver/platform/common/inc/msm_vidc_platform_ext.h index 284bbb4504..b134938db2 100644 --- a/driver/platform/common/inc/msm_vidc_platform_ext.h +++ b/driver/platform/common/inc/msm_vidc_platform_ext.h @@ -8,6 +8,9 @@ #include "msm_vidc_control.h" +/* HEIC encoder and decoder */ +#define V4L2_PIX_FMT_VIDC_HEIC v4l2_fourcc('H', 'E', 'I', 'C') + int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_dec_frame_rate(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_dec_operating_rate(void *instance, struct v4l2_ctrl *ctrl); diff --git a/driver/platform/kalama/src/msm_vidc_kalama.c b/driver/platform/kalama/src/msm_vidc_kalama.c index 0b7bbc9fd6..66645e5a00 100644 --- a/driver/platform/kalama/src/msm_vidc_kalama.c +++ b/driver/platform/kalama/src/msm_vidc_kalama.c @@ -73,7 +73,7 @@ static struct codec_info codec_data_kalama[] = { .pixfmt_name = "AV1", }, { - .v4l2_codec = V4L2_PIX_FMT_HEIC, + .v4l2_codec = V4L2_PIX_FMT_VIDC_HEIC, .vidc_codec = MSM_VIDC_HEIC, .pixfmt_name = "HEIC", }, diff --git a/driver/platform/pineapple/src/msm_vidc_pineapple.c b/driver/platform/pineapple/src/msm_vidc_pineapple.c index 4c8e9b89ef..8b92d7db01 100644 --- a/driver/platform/pineapple/src/msm_vidc_pineapple.c +++ b/driver/platform/pineapple/src/msm_vidc_pineapple.c @@ -75,7 +75,7 @@ static struct codec_info codec_data_pineapple[] = { .pixfmt_name = "AV1", }, { - .v4l2_codec = V4L2_PIX_FMT_HEIC, + .v4l2_codec = V4L2_PIX_FMT_VIDC_HEIC, .vidc_codec = MSM_VIDC_HEIC, .pixfmt_name = "HEIC", }, diff --git a/include/uapi/vidc/media/v4l2_vidc_extensions.h b/include/uapi/vidc/media/v4l2_vidc_extensions.h index 36f0f2d7a2..89d60f134b 100644 --- a/include/uapi/vidc/media/v4l2_vidc_extensions.h +++ b/include/uapi/vidc/media/v4l2_vidc_extensions.h @@ -13,8 +13,6 @@ /* 32 RGBA-8-8-8-8 compressed */ #define V4L2_PIX_FMT_VIDC_ARGB32C v4l2_fourcc('Q', '2', '4', 'C') #define V4L2_META_FMT_VIDC v4l2_fourcc('Q', 'M', 'E', 'T') -/* HEIC encoder and decoder */ -#define V4L2_PIX_FMT_HEIC v4l2_fourcc('H', 'E', 'I', 'C') /* AV1 */ #define V4L2_PIX_FMT_AV1 v4l2_fourcc('A', 'V', '1', '0')