From 37ba4229ade758c09807c5e09acd94e7fd25c94c Mon Sep 17 00:00:00 2001 From: Herman Chen Date: Wed, 22 Jul 2020 10:54:55 +0800 Subject: [PATCH] [hal_enc_task]: Add MppEncRefFrmUsrCfg There force reference frame user configure is added to encoder task. Change-Id: I4482a831f988f47913c6e1d0385ccbdd0cd46031 Signed-off-by: Herman Chen --- mpp/codec/mpp_enc_v2.cpp | 2 ++ mpp/hal/inc/hal_enc_task.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/mpp/codec/mpp_enc_v2.cpp b/mpp/codec/mpp_enc_v2.cpp index 8f7b32bc..94b2b872 100644 --- a/mpp/codec/mpp_enc_v2.cpp +++ b/mpp/codec/mpp_enc_v2.cpp @@ -701,6 +701,7 @@ void *mpp_enc_thread(void *data) EncRcTask *rc_task = &enc->rc_task; EncCpbStatus *cpb = &rc_task->cpb; EncFrmStatus *frm = &rc_task->frm; + MppEncRefFrmUsrCfg *frm_cfg = &enc->frm_cfg; EncTask task; HalTaskInfo *task_info = &task.info; HalEncTask *hal_task = &task_info->enc; @@ -857,6 +858,7 @@ void *mpp_enc_thread(void *data) reset_hal_enc_task(hal_task); reset_enc_rc_task(rc_task); hal_task->rc_task = rc_task; + hal_task->frm_cfg = frm_cfg; frm->seq_idx = task.seq_idx++; rc_task->frame = frame; diff --git a/mpp/hal/inc/hal_enc_task.h b/mpp/hal/inc/hal_enc_task.h index 4aa3ce51..93884eea 100644 --- a/mpp/hal/inc/hal_enc_task.h +++ b/mpp/hal/inc/hal_enc_task.h @@ -20,6 +20,7 @@ #include "hal_task_defs.h" #include "mpp_rc_defs.h" +#include "mpp_enc_refs.h" #define HAL_ENC_TASK_ERR_INIT 0x00000001 #define HAL_ENC_TASK_ERR_ALLOC 0x00000010 @@ -38,6 +39,9 @@ typedef struct HalEncTask_t { // rate control data channel EncRcTask *rc_task; + // cpb reference force config + MppEncRefFrmUsrCfg *frm_cfg; + // current tesk protocol syntax information MppSyntax syntax; MppSyntax hal_ret;