shithub: openh264

Download patch

ref: 4bc881c3aebb361fe9db888af16efa945b6c570a
parent: c247c5a05dbdfcf3f499d6a4b57f05cd68e081d7
author: lyao2 <[email protected]>
date: Thu Mar 20 05:26:16 EDT 2014 

RC LOWBR mode merge


--- a/codec/encoder/core/inc/param_svc.h
+++ b/codec/encoder/core/inc/param_svc.h
@@ -247,14 +247,9 @@
   SUsedPicRect.iWidth = ((iPicWidth >> 1) << 1);
   SUsedPicRect.iHeight = ((iPicHeight >> 1) << 1);
 
-   bEnableRc			= kbEnableRc;
-  if (pCodingParam.iRCMode != RC_MODE0 && pCodingParam.iRCMode != RC_MODE1)
-    iRCMode = RC_MODE1;
-  else
-    iRCMode = pCodingParam.iRCMode;    // rc mode
+  bEnableRc			= kbEnableRc;
+  iRCMode = pCodingParam.iRCMode;    // rc mode
 
-
-
   int8_t iIdxSpatial	= 0;
   uint8_t uiProfileIdc		= PRO_BASELINE;
   SDLayerParam* pDlp		= &sDependencyLayers[0];
@@ -327,10 +322,7 @@
 
   /* Rate Control */
   bEnableRc			= pCodingParam.bEnableRc;
-  if (pCodingParam.iRCMode != RC_MODE0 && pCodingParam.iRCMode != RC_MODE1)
-    iRCMode = RC_MODE1;
-  else
-    iRCMode = pCodingParam.iRCMode;    // rc mode
+  iRCMode = pCodingParam.iRCMode;    // rc mode
   iPaddingFlag = pCodingParam.iPaddingFlag;
 
   iTargetBitrate		= pCodingParam.iTargetBitrate;	// target bitrate
--- a/codec/encoder/core/inc/rc.h
+++ b/codec/encoder/core/inc/rc.h
@@ -58,8 +58,15 @@
 typedef enum {
   RC_MODE0,	//Quality mode
   RC_MODE1,   //Bitrate mode
+  RC_MODE_LOWBR, //bitrate limited mode
 } RC_MODES;
 
+enum{
+  BITS_NORMAL,
+  BITS_LIMITED,
+  BITS_EXCEEDED,
+};
+
 enum {
   //virtual gop size
   VGOP_SIZE             = 8,
@@ -160,6 +167,7 @@
   // bits allocation and status
   int32_t   iRemainingBits;
   int32_t   iTargetBits;
+  int32_t   iCurrentBitsLevel;//0:normal; 1:limited; 2:exceeded.
 
   int32_t   iIdrNum;
   int32_t   iIntraComplexity;
@@ -170,7 +178,7 @@
   int32_t   iFrameDqBits;
 
   double*    pGomComplexity;
-  int32_t*  	pGomForegroundBlockNum;
+  int32_t*   pGomForegroundBlockNum;
   int32_t*   pCurrentFrameGomSad;
   int32_t*   pGomCost;
 
@@ -177,7 +185,7 @@
   int32_t   iAverageFrameQp;
   int32_t   iNumberMbFrame;
   int32_t   iNumberMbGom;
-  int32_t	  iSliceNum;
+  int32_t	iSliceNum;
   int32_t   iGomSize;
 
   int32_t   iSkipFrameNum;
--- a/codec/encoder/core/src/ratectl.cpp
+++ b/codec/encoder/core/src/ratectl.cpp
@@ -429,7 +429,22 @@
 
   if (0 == pTOverRc->iPFrameNum) {
     iLumaQp = pWelsSvcRc->iInitialQp;
-  } else {
+  }
+  else if (pWelsSvcRc->iCurrentBitsLevel==BITS_EXCEEDED)
+  {
+	iLumaQp = 42;
+	pWelsSvcRc->dQStep = RcConvertQp2QStep (iLumaQp);
+	pWelsSvcRc->iLastCalculatedQScale = iLumaQp;
+
+	if (pEncCtx->pSvcParam->bEnableAdaptiveQuant) {
+		iLumaQp = (int32_t)(iLumaQp - pEncCtx->pVaa->sAdaptiveQuantParam.dAverMotionTextureIndexToDeltaQp);
+	}
+
+	pEncCtx->iGlobalQp = iLumaQp;
+
+	return;
+  }
+  else {
     double dCmplxRatio = (double)pEncCtx->pVaa->sComplexityAnalysisParam.iFrameComplexity / pTOverRc->iFrameCmplxMean;
     dCmplxRatio = WELS_CLIP3 (dCmplxRatio, 1.0 - FRAME_CMPLX_RATIO_RANGE, 1.0 + FRAME_CMPLX_RATIO_RANGE);
 
@@ -459,8 +474,11 @@
 #ifndef _NOT_USE_AQ_FOR_TEST_
   if (pEncCtx->pSvcParam->bEnableAdaptiveQuant) {
 
-    iLumaQp = (int32_t)WELS_CLIP3 (iLumaQp - pEncCtx->pVaa->sAdaptiveQuantParam.dAverMotionTextureIndexToDeltaQp,
-                                   pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
+	iLumaQp = (int32_t)(iLumaQp - pEncCtx->pVaa->sAdaptiveQuantParam.dAverMotionTextureIndexToDeltaQp);
+
+	if (pEncCtx->pSvcParam->iRCMode!=RC_MODE_LOWBR)
+	  iLumaQp = (int32_t)WELS_CLIP3 (iLumaQp,pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
+
   }
 #endif
   pEncCtx->iGlobalQp = iLumaQp;
@@ -489,6 +507,8 @@
 void RcDecideTargetBits (sWelsEncCtx* pEncCtx) {
   SWelsSvcRc* pWelsSvcRc	= &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
   SRCTemporal* pTOverRc		= &pWelsSvcRc->pTemporalOverRc[pEncCtx->uiTemporalId];
+
+  pWelsSvcRc->iCurrentBitsLevel = BITS_NORMAL;
   //allocate bits
   if (pEncCtx->eSliceType == I_SLICE) {
     pWelsSvcRc->iTargetBits = (int32_t) (pWelsSvcRc->dBitsPerFrame * IDR_BITRATE_RATIO);
@@ -495,6 +515,14 @@
   } else {
     pWelsSvcRc->iTargetBits = (int32_t) (pWelsSvcRc->iRemainingBits * pTOverRc->dTlayerWeight /
                                          pWelsSvcRc->dRemainingWeights);
+	if ((pWelsSvcRc->iTargetBits <= 0) && (pEncCtx->pSvcParam->iRCMode == RC_MODE_LOWBR))
+	{
+		pWelsSvcRc->iCurrentBitsLevel = BITS_EXCEEDED;
+	}
+	else if ((pWelsSvcRc->iTargetBits <= pTOverRc->iMinBitsTl) && (pEncCtx->pSvcParam->iRCMode == RC_MODE_LOWBR))
+	{
+		pWelsSvcRc->iCurrentBitsLevel = BITS_LIMITED;
+	}
     pWelsSvcRc->iTargetBits = WELS_CLIP3 (pWelsSvcRc->iTargetBits, pTOverRc->iMinBitsTl,	pTOverRc->iMaxBitsTl);
   }
   pWelsSvcRc->dRemainingWeights -= pTOverRc->dTlayerWeight;
@@ -617,6 +645,7 @@
 
   pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice,
                                  pEncCtx->iGlobalQp - pWelsSvcRc->iQpRangeLowerInFrame, pEncCtx->iGlobalQp + pWelsSvcRc->iQpRangeUpperInFrame);
+  if (!(pEncCtx->pSvcParam->iRCMode==RC_MODE_LOWBR))
   pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
 
   pSOverRc->iGomBitsSlice = 0;
--- a/codec/encoder/core/src/wels_preprocess.cpp
+++ b/codec/encoder/core/src/wels_preprocess.cpp
@@ -346,7 +346,7 @@
   {
     SPicture* pLastPic = m_pLastSpatialPicture[kiDidx][0];
     bool bCalculateSQDiff = ((pLastPic->pData[0] == pRefPic->pData[0]) && bNeededMbAq);
-    bool bCalculateVar = (pSvcParam->iRCMode == RC_MODE1 && pCtx->eSliceType == I_SLICE);
+    bool bCalculateVar = (pSvcParam->iRCMode >= RC_MODE1 && pCtx->eSliceType == I_SLICE);
 
     VaaCalculation (pCtx->pVaa, pCurPic, pRefPic, bCalculateSQDiff, bCalculateVar, bCalculateBGD);
   }
@@ -833,9 +833,9 @@
 
   if (pSvcParam->iRCMode == RC_MODE0 && pCtx->eSliceType == P_SLICE) {
     iComplexityAnalysisMode = FRAME_SAD;
-  } else if (pSvcParam->iRCMode == RC_MODE1 && pCtx->eSliceType == P_SLICE) {
+  } else if (pSvcParam->iRCMode >= RC_MODE1 && pCtx->eSliceType == P_SLICE) {
     iComplexityAnalysisMode = GOM_SAD;
-  } else if (pSvcParam->iRCMode == RC_MODE1 && pCtx->eSliceType == I_SLICE) {
+  } else if (pSvcParam->iRCMode >= RC_MODE1 && pCtx->eSliceType == I_SLICE) {
     iComplexityAnalysisMode = GOM_VAR;
   } else {
     return;
--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -840,7 +840,7 @@
     WelsEncoderApplyBitRate (m_pEncContext->pSvcParam);
   }
   break;
-  case ENCODER_OPTION_RC_MODE: {	// 0:quality mode;1:bit-rate mode
+  case ENCODER_OPTION_RC_MODE: {	// 0:quality mode;1:bit-rate mode;2:bitrate limited mode
     int32_t iValue = * ((int32_t*)pOption);
     m_pEncContext->pSvcParam->iRCMode	= iValue;
   }