starred/mpp-nyanmisaka
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2026-01-24 03:00:40 +01:00
Code Issues Projects Packages Wiki Activity Actions

[mpp_frame]: Fix using ffmpeg definition

Browse source 
Do NOT use ffmpeg define.

Change-Id: I018cbd56db12d708d5a9db20523d674248ba540f
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen 2020-09-17 10:15:32 +08:00
parent 77a795a7fc
commit 4b386eba08
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inc/mpp_frame.h
View file

@ -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;

2
mpp/codec/enc/h264/h264e_sps.c
View file

@ -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) ||

2
mpp/codec/enc/h265/h265e_ps.c
View file

@ -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) ||