diff --git a/inc/mpp_frame.h b/inc/mpp_frame.h index 7db0f592..1086ad05 100644 --- a/inc/mpp_frame.h +++ b/inc/mpp_frame.h @@ -85,7 +85,7 @@ typedef enum { MPP_FRAME_PRI_SMPTEST428_1 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ) MPP_FRAME_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) / DCI P3 MPP_FRAME_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3 - AVCOL_PRI_JEDEC_P22 = 22, ///< JEDEC P22 phosphors + MPP_FRAME_PRI_JEDEC_P22 = 22, ///< JEDEC P22 phosphors MPP_FRAME_PRI_NB, ///< Not part of ABI } MppFrameColorPrimaries; diff --git a/mpp/codec/enc/h264/h264e_sps.c b/mpp/codec/enc/h264/h264e_sps.c index ec9adcbb..2db7351a 100644 --- a/mpp/codec/enc/h264/h264e_sps.c +++ b/mpp/codec/enc/h264/h264e_sps.c @@ -174,7 +174,7 @@ MPP_RET h264e_sps_update(SynH264eSps *sps, MppEncCfgSet *cfg) vui->fullrange = 1; } - if ((prep->colorprim <= AVCOL_PRI_JEDEC_P22 && + if ((prep->colorprim <= MPP_FRAME_PRI_JEDEC_P22 && prep->colorprim != MPP_FRAME_PRI_UNSPECIFIED) || (prep->colortrc <= MPP_FRAME_TRC_ARIB_STD_B67 && prep->colortrc != MPP_FRAME_TRC_UNSPECIFIED) || diff --git a/mpp/codec/enc/h265/h265e_ps.c b/mpp/codec/enc/h265/h265e_ps.c index 0aa5dc0b..3062710a 100644 --- a/mpp/codec/enc/h265/h265e_ps.c +++ b/mpp/codec/enc/h265/h265e_ps.c @@ -263,7 +263,7 @@ MPP_RET h265e_set_sps(H265eCtx *ctx, H265eSps *sps, H265eVps *vps) sps->vui.m_videoSignalTypePresentFlag = 1; } - if ((prep->colorprim <= AVCOL_PRI_JEDEC_P22 && + if ((prep->colorprim <= MPP_FRAME_PRI_JEDEC_P22 && prep->colorprim != MPP_FRAME_PRI_UNSPECIFIED) || (prep->colortrc <= MPP_FRAME_TRC_ARIB_STD_B67 && prep->colortrc != MPP_FRAME_TRC_UNSPECIFIED) ||