Merge pull request cisco#3266 from fulinjie/pr-multi_refs_encode

Pr multi refs encode
muse117 · Apr 20, 2020 · 79a1c1e · 79a1c1e
2 parents 7067d2d + 8e90a27
commit 79a1c1e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/codec/encoder/core/inc/param_svc.h b/codec/encoder/core/inc/param_svc.h
@@ -365,7 +365,7 @@ typedef struct TagWelsSvcCodingParam: SEncParamExt {
  uiIntraPeriod = ((uiIntraPeriod + uiGopSize - 1) / uiGopSize) * uiGopSize;
 
  if (((pCodingParam.iNumRefFrame != AUTO_REF_PIC_COUNT)
- && ((pCodingParam.iNumRefFrame > MAX_REF_PIC_COUNT) || (pCodingParam.iNumRefFrame < MIN_REF_PIC_COUNT)))
+ && !((pCodingParam.iNumRefFrame > MAX_REF_PIC_COUNT) || (pCodingParam.iNumRefFrame < MIN_REF_PIC_COUNT)))
  || ((iNumRefFrame != AUTO_REF_PIC_COUNT) && (pCodingParam.iNumRefFrame == AUTO_REF_PIC_COUNT))) {
  iNumRefFrame = pCodingParam.iNumRefFrame;
  }

diff --git a/codec/encoder/core/src/au_set.cpp b/codec/encoder/core/src/au_set.cpp
@@ -134,7 +134,7 @@ static int32_t WelsCheckNumRefSetting (SLogContext* pLogCtx, SWelsSvcCodingParam
 
 int32_t WelsCheckRefFrameLimitationNumRefFirst (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam) {
 
- if (WelsCheckNumRefSetting (pLogCtx, pParam, true)) {
+ if (WelsCheckNumRefSetting (pLogCtx, pParam, false)) {
  // we take num-ref as the honored setting but it conflicts with temporal and LTR
  return ENC_RETURN_UNSUPPORTED_PARA;
  }

diff --git a/codec/encoder/core/src/ref_list_mgr_svc.cpp b/codec/encoder/core/src/ref_list_mgr_svc.cpp
@@ -628,7 +628,6 @@ bool WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t iPOC, int32_t iBestLtrRe
  WelsLog (& (pCtx->sLogCtx), WELS_LOG_DETAIL,
  "WelsBuildRefList pCtx->uiTemporalId = %d,pRef->iFrameNum = %d,pRef->uiTemporalId = %d",
  pCtx->uiTemporalId, pRef->iFrameNum, pRef->uiTemporalId);
- break;
  }
  }
  }

diff --git a/codec/encoder/core/src/svc_encode_slice.cpp b/codec/encoder/core/src/svc_encode_slice.cpp
@@ -101,7 +101,7 @@ void WelsSliceHeaderExtInit (sWelsEncCtx* pEncCtx, SDqLayer* pCurLayer, SSlice*
  if (P_SLICE == pEncCtx->eSliceType) {
  pCurSliceHeader->uiNumRefIdxL0Active = 1;
  if (pCurSliceHeader->uiRefCount > 0 &&
- pCurSliceHeader->uiRefCount < pCurLayer->sLayerInfo.pSpsP->iNumRefFrames) {
+ pCurSliceHeader->uiRefCount <= pCurLayer->sLayerInfo.pSpsP->iNumRefFrames) {
  pCurSliceHeader->bNumRefIdxActiveOverrideFlag = true;
  pCurSliceHeader->uiNumRefIdxL0Active = pCurSliceHeader->uiRefCount;
  }