shithub: openh264

Info  •  Files  •  Log  •  Branches

remove duplicate constant macro and modify the num_ref check accordingly

--- a/codec/encoder/core/inc/param_svc.h

+++ b/codec/encoder/core/inc/param_svc.h

@@ -362,7 +362,7 @@

     iLTRRefNum = bEnableLongTermReference ? LONG_TERM_REF_NUM : 0;

     if (iNumRefFrame == AUTO_REF_PIC_COUNT) {

       iNumRefFrame		= ((uiGopSize >> 1) > 1) ? ((uiGopSize >> 1) + iLTRRefNum) : (MIN_REF_PIC_COUNT + iLTRRefNum);

-      iNumRefFrame		= WELS_CLIP3 (iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM);

+      iNumRefFrame		= WELS_CLIP3 (iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA);

     }

   }

   if (iNumRefFrame > iMaxNumRefFrame)

--- a/codec/encoder/core/inc/wels_const.h

+++ b/codec/encoder/core/inc/wels_const.h

@@ -149,7 +149,6 @@

 #define MAX_SHORT_REF_COUNT		(MAX_GOP_SIZE>>1) // 16 in standard, maximal count number of short reference pictures

 #define LONG_TERM_REF_NUM       2

 #define LONG_TERM_REF_NUM_SCREEN 4

-#define MAX_LONG_REF_COUNT		2 // 16 in standard, maximal count number of long reference pictures

 #define MAX_REF_PIC_COUNT		16 // 32 in standard, maximal Short + Long reference pictures

 #define MIN_REF_PIC_COUNT		1		// minimal count number of reference pictures, 1 short + 2 key reference based?

 #define MAX_MULTI_REF_PIC_COUNT	1	//maximum multi-reference number

@@ -159,7 +158,8 @@

 // adjusted numbers reference picture functionality related definition

 #define MAX_REFERENCE_MMCO_COUNT_NUM		4	// adjusted MAX_MMCO_COUNT(66 in standard) definition per encoder design

 #define MAX_REFERENCE_REORDER_COUNT_NUM		2	// adjusted MAX_REF_PIC_COUNT(32 in standard) for reference reordering definition per encoder design

-#define MAX_REFERENCE_PICTURE_COUNT_NUM		(MAX_SHORT_REF_COUNT+MAX_LONG_REF_COUNT)	// <= MAX_REF_PIC_COUNT, memory saved if <

+#define MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA		(MAX_SHORT_REF_COUNT+LONG_TERM_REF_NUM)	// <= MAX_REF_PIC_COUNT, memory saved if <

+#define MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN		(MAX_SHORT_REF_COUNT+LONG_TERM_REF_NUM_SCREEN)	// <= MAX_REF_PIC_COUNT, memory saved if <

 #define BASE_QUALITY_ID			0

 #define BASE_DEPENDENCY_ID		0

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

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

@@ -1358,7 +1358,7 @@

   iTargetSpatialBsSize = iLayerBsSize;

   iCountBsLen = iNonVclLayersBsSizeCount + iVclLayersBsSizeCount;

-  pParam->iNumRefFrame	= WELS_CLIP3 (pParam->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM);

+  pParam->iNumRefFrame	= WELS_CLIP3 (pParam->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA);

   // Output

   (*ppCtx)->pOut = (SWelsEncoderOutput*)pMa->WelsMalloc (sizeof (SWelsEncoderOutput), "SWelsEncoderOutput");

@@ -3741,7 +3741,7 @@

   } else {

     /* maybe adjustment introduced in bitrate or little settings adjustment and so on.. */

     pNewParam->iNumRefFrame								= WELS_CLIP3 (pNewParam->iNumRefFrame, MIN_REF_PIC_COUNT,

-                                            MAX_REFERENCE_PICTURE_COUNT_NUM);

+      (pNewParam->iUsageType==CAMERA_VIDEO_REAL_TIME?MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA:MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN));

     pNewParam->iLoopFilterDisableIdc					= WELS_CLIP3 (pNewParam->iLoopFilterDisableIdc, 0, 6);

     pNewParam->iLoopFilterAlphaC0Offset				= WELS_CLIP3 (pNewParam->iLoopFilterAlphaC0Offset, -6, 6);

     pNewParam->iLoopFilterBetaOffset					= WELS_CLIP3 (pNewParam->iLoopFilterBetaOffset, -6, 6);

@@ -3846,7 +3846,7 @@

     }

     iNumRefFrame		= ((uiGopSize >> 1) > 1) ? ((uiGopSize >> 1) + sConfig.iLTRRefNum) : (MIN_REF_PIC_COUNT +

                       sConfig.iLTRRefNum);

-    iNumRefFrame		= WELS_CLIP3 (iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM);

+    iNumRefFrame		= WELS_CLIP3 (iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA);

   }

   if (sConfig.iNumRefFrame < iNumRefFrame)

--- a/codec/encoder/plus/src/welsEncoderExt.cpp

+++ b/codec/encoder/plus/src/welsEncoderExt.cpp

@@ -325,7 +325,7 @@

     if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT) {

       pCfg->iNumRefFrame		= ((pCfg->uiGopSize >> 1) > 1) ? ((pCfg->uiGopSize >> 1) + pCfg->iLTRRefNum) :

                               (MIN_REF_PIC_COUNT + pCfg->iLTRRefNum);

-      pCfg->iNumRefFrame		= WELS_CLIP3 (pCfg->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM);

+      pCfg->iNumRefFrame		= WELS_CLIP3 (pCfg->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA);

     }

   }

   if (pCfg->iNumRefFrame > pCfg->iMaxNumRefFrame)

@@ -519,8 +519,9 @@

   }

 }

 void CWelsH264SVCEncoder::CheckReferenceNumSetting (int32_t iNumRef) {

+  int32_t iRefUpperBound = (m_pEncContext->pSvcParam->iUsageType == CAMERA_VIDEO_REAL_TIME)?MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA:MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN;

   m_pEncContext->pSvcParam->iNumRefFrame = iNumRef;

-  if ((iNumRef < MIN_REF_PIC_COUNT) || (iNumRef > MAX_REFERENCE_PICTURE_COUNT_NUM)) {

+  if ((iNumRef < MIN_REF_PIC_COUNT) || (iNumRef > iRefUpperBound)) {

     m_pEncContext->pSvcParam->iNumRefFrame = AUTO_REF_PIC_COUNT;

     WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,

              "doesn't support the number of reference frame(%d) change to auto select mode", iNumRef);