diff --git a/inc/rk_mpi_cmd.h b/inc/rk_mpi_cmd.h index a1416ab5..9530fb6f 100644 --- a/inc/rk_mpi_cmd.h +++ b/inc/rk_mpi_cmd.h @@ -96,8 +96,8 @@ typedef enum { MPP_ENC_CMD_BASE = CMD_MODULE_CODEC | CMD_CTX_ID_ENC, /* basic encoder setup control */ - MPP_ENC_SET_ALL_CFG, /* set MppEncCfgSet structure */ - MPP_ENC_GET_ALL_CFG, /* get MppEncCfgSet structure */ + MPP_ENC_SET_CFG, /* set MppEncCfgSet structure */ + MPP_ENC_GET_CFG, /* get MppEncCfgSet structure */ MPP_ENC_SET_PREP_CFG, /* set MppEncPrepCfg structure */ MPP_ENC_GET_PREP_CFG, /* get MppEncPrepCfg structure */ MPP_ENC_SET_RC_CFG, /* set MppEncRcCfg structure */ diff --git a/mpp/codec/enc/h264/h264e_api_v2.c b/mpp/codec/enc/h264/h264e_api_v2.c index a4c19c70..92943fd9 100644 --- a/mpp/codec/enc/h264/h264e_api_v2.c +++ b/mpp/codec/enc/h264/h264e_api_v2.c @@ -200,7 +200,7 @@ static MPP_RET h264e_proc_cfg(void *ctx, MpiCmd cmd, void *param) h264e_dbg_func("enter ctx %p cmd %x param %p\n", ctx, cmd, param); switch (cmd) { - case MPP_ENC_SET_ALL_CFG : { + case MPP_ENC_SET_CFG : { } break; case MPP_ENC_SET_PREP_CFG : { MppEncPrepCfg *src = (MppEncPrepCfg *)param; diff --git a/mpp/codec/mpp_enc.cpp b/mpp/codec/mpp_enc.cpp index 6aa61db8..7332a349 100644 --- a/mpp/codec/mpp_enc.cpp +++ b/mpp/codec/mpp_enc.cpp @@ -599,7 +599,7 @@ MPP_RET mpp_enc_control(MppEnc ctx, MpiCmd cmd, void *param) AutoMutex auto_lock(&enc->lock); switch (cmd) { - case MPP_ENC_SET_ALL_CFG : { + case MPP_ENC_SET_CFG : { MppEncRcCfg *rc = &enc->set.rc; enc_dbg_ctrl("set all config\n"); @@ -621,7 +621,7 @@ MPP_RET mpp_enc_control(MppEnc ctx, MpiCmd cmd, void *param) if (!ret) ret = mpp_hal_control(enc->hal, MPP_ENC_SET_CODEC_CFG, &enc->set.codec); } break; - case MPP_ENC_GET_ALL_CFG : { + case MPP_ENC_GET_CFG : { MppEncCfgSet *p = (MppEncCfgSet *)param; enc_dbg_ctrl("get all config\n"); diff --git a/mpp/codec/mpp_enc_v2.cpp b/mpp/codec/mpp_enc_v2.cpp index 3cbfec4d..892bb2e1 100644 --- a/mpp/codec/mpp_enc_v2.cpp +++ b/mpp/codec/mpp_enc_v2.cpp @@ -1075,7 +1075,7 @@ MPP_RET mpp_enc_control_v2(MppEnc ctx, MpiCmd cmd, void *param) enc_dbg_ctrl("sending cmd %d param %p\n", cmd, param); switch (cmd) { - case MPP_ENC_GET_ALL_CFG : { + case MPP_ENC_GET_CFG : { enc_dbg_ctrl("get all config\n"); memcpy(param, &enc->cfg, sizeof(enc->cfg)); } break;