package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-29 03:32:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[h264e]: fix encoder configure error

Browse Source 
1. miss cabac/8x8 flag
2. disable return status check
3. hal will not change input_image_format in syntax

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1181 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-08-10 01:41:48 +00:00
parent fdc9c5d4b4
commit c2284f4545
4 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mpp/codec/enc/h264/src/H264EncApi.c
View File

@@ -846,6 +846,7 @@ H264EncRet H264EncStrmEncode(H264ECtx *pEncInst, const H264EncIn * pEncIn,
RK_S32 EncAsicCheckHwStatus(asicData_s *asic)
{
RK_S32 ret = ASIC_STATUS_FRAME_READY;
/*
RK_U32 status = asic->regs.hw_status;
if (status & ASIC_STATUS_ERROR) {
@@ -857,7 +858,7 @@ RK_S32 EncAsicCheckHwStatus(asicData_s *asic)
} else {
ret = ASIC_STATUS_BUFF_FULL;
}
*/
return ret;
}

7
mpp/codec/enc/h264/src/h264e_api.c
View File

@@ -278,10 +278,7 @@ MPP_RET h264e_config(void *ctx, RK_S32 cmd, void *param)
mpp_err("width %d height %d is not available\n", mpp_cfg->width, mpp_cfg->height);
enc_cfg->frameRateNum = mpp_cfg->fps_in;
if (mpp_cfg->cabac_en)
enc_cfg->enable_cabac = mpp_cfg->cabac_en;
else
enc_cfg->enable_cabac = 0;
enc_cfg->enable_cabac = mpp_cfg->cabac_en;
enc_cfg->transform8x8_mode = (enc_cfg->profile >= H264_PROFILE_HIGH) ? (1) : (0);
enc_cfg->chroma_qp_index_offset = 2;
@@ -302,9 +299,11 @@ MPP_RET h264e_config(void *ctx, RK_S32 cmd, void *param)
oriCodingCfg.sliceSize = 0;
oriCodingCfg.constrainedIntraPrediction = 0;
oriCodingCfg.disableDeblockingFilter = 0;
oriCodingCfg.enableCabac = enc_cfg->enable_cabac;
oriCodingCfg.cabacInitIdc = 0;
oriCodingCfg.videoFullRange = 0;
oriCodingCfg.seiMessages = 0;
oriCodingCfg.transform8x8Mode = enc_cfg->transform8x8_mode;
ret = H264EncSetCodingCtrl(enc, &oriCodingCfg);
if (ret) {
mpp_err("H264EncSetCodingCtrl() failed, ret %d.", ret);