shithub: openh264

Info  •  Files  •  Log  •  Branches

If lowering the maximum number of ref frames, check iNumRefFrames as well

Make sure we don't set iMaxNumRefFrames lower than iNumRefFrames.

This fixes occasional test failures in
EncodeDecodeTestAPI.SetOptionEncParamExt.

--- a/codec/encoder/core/src/au_set.cpp

+++ b/codec/encoder/core/src/au_set.cpp

@@ -98,8 +98,11 @@

       WelsLog (pLogCtx, WELS_LOG_WARNING, "change level to level5.0");

     }

     iRefFrame = g_ksLevelLimits[pSpatialLayer->uiLevelIdc - 1].uiMaxDPBMbs / uiPicInMBs;

-    if (iRefFrame < pParam->iMaxNumRefFrame)

+    if (iRefFrame < pParam->iMaxNumRefFrame) {

       pParam->iMaxNumRefFrame = iRefFrame;

+      if (pParam->iMaxNumRefFrame < pParam->iNumRefFrame)

+        pParam->iNumRefFrame = pParam->iMaxNumRefFrame;

+    }

     if (pParam->iMaxNumRefFrame < 1) {

       pParam->iMaxNumRefFrame = 1;

       WelsLog (pLogCtx, WELS_LOG_ERROR, "error Level setting (%d)", pSpatialLayer->uiLevelIdc);