From 4d2a140f8063fce66e51c30e2a6471fa167a50e5 Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Fri, 5 Aug 2016 11:11:57 +0000 Subject: [PATCH] [h264e]: remvoe outdate default setting git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1163 6e48237b-75ef-9749-8fc9-41990f28c85a --- mpp/codec/enc/h264/src/h264e_api.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/mpp/codec/enc/h264/src/h264e_api.c b/mpp/codec/enc/h264/src/h264e_api.c index ea73dc00..e9c8bd57 100644 --- a/mpp/codec/enc/h264/src/h264e_api.c +++ b/mpp/codec/enc/h264/src/h264e_api.c @@ -302,7 +302,6 @@ MPP_RET h264e_config(void *ctx, RK_S32 cmd, void *param) oriCodingCfg.sliceSize = 0; oriCodingCfg.constrainedIntraPrediction = 0; oriCodingCfg.disableDeblockingFilter = 0; - oriCodingCfg.enableCabac = 0; oriCodingCfg.cabacInitIdc = 0; oriCodingCfg.transform8x8Mode = 0; oriCodingCfg.videoFullRange = 0; @@ -326,23 +325,6 @@ MPP_RET h264e_config(void *ctx, RK_S32 cmd, void *param) oriPreProcCfg.origWidth, oriPreProcCfg.origHeight, oriPreProcCfg.xOffset, oriPreProcCfg.yOffset, oriPreProcCfg.inputType, oriPreProcCfg.rotation, oriPreProcCfg.videoStabilization, oriPreProcCfg.colorConversion.type); - // ---------------- - // will be replaced modify by lance 2016.05.20 - oriPreProcCfg.inputType = MPP_FMT_YUV420P; - oriPreProcCfg.rotation = H264ENC_ROTATE_0; - oriPreProcCfg.origWidth = enc_cfg->width; - oriPreProcCfg.origHeight = enc_cfg->height; - oriPreProcCfg.xOffset = 0; - oriPreProcCfg.yOffset = 0; - oriPreProcCfg.videoStabilization = 0; - oriPreProcCfg.colorConversion.type = H264ENC_RGBTOYUV_BT601; - if (oriPreProcCfg.colorConversion.type == H264ENC_RGBTOYUV_USER_DEFINED) { - oriPreProcCfg.colorConversion.coeffA = 20000; - oriPreProcCfg.colorConversion.coeffB = 44000; - oriPreProcCfg.colorConversion.coeffC = 5000; - oriPreProcCfg.colorConversion.coeffE = 35000; - oriPreProcCfg.colorConversion.coeffF = 38000; - } ret = H264EncSetPreProcessing(enc, &oriPreProcCfg); if (ret) {