Merge pull request #2026 from sijchen/fix_rc

[Encoder] let qp clip to min/max qp available in all rc settings
cisco · Jul 8, 2015 · a8ae134 · a8ae134
2 parents d04c7b9 + ee09f4d
commit a8ae134
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/codec/encoder/core/src/ratectl.cpp b/codec/encoder/core/src/ratectl.cpp
@@ -506,10 +506,7 @@ void RcCalculatePictureQp (sWelsEncCtx* pEncCtx) {
 
     iLumaQp =  WELS_DIV_ROUND (iLumaQp * INT_MULTIPLY - pEncCtx->pVaa->sAdaptiveQuantParam.iAverMotionTextureIndexToDeltaQp,
                                INT_MULTIPLY);
-
-    if (! ((pEncCtx->pSvcParam->iRCMode == RC_BITRATE_MODE) && (pEncCtx->pSvcParam->bEnableFrameSkip == false)))
-      iLumaQp = WELS_CLIP3 (iLumaQp, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
-
+    iLumaQp = WELS_CLIP3 (iLumaQp, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
   }
   pEncCtx->iGlobalQp = iLumaQp;
 }