Ticket #703: max_num_merge_cand.patch

App/TAppEncoder/TAppEncCfg.cpp

@@ -308 +308 @@
     ("ScalingList",                 m_useScalingListId,              0,          "0: no scaling list, 1: default scaling lists, 2: scaling lists specified in ScalingListFile")
     ("ScalingListFile",             cfg_ScalingListFile,             string(""), "Scaling list file name")
     ("SignHideFlag,-SBH",                m_signHideFlag, 1)
+    ("MaxNumMergeCand",             m_uiMaxNumMergeCand,             5u,         "Maximum number of merge candidates")
+
   /* Misc. */
   ("SEIpictureDigest", m_pictureDigestEnabled, 0, "Control generation of picture_digest SEI messages\n"
                                               "\t3: checksum\n"
@@ -546 +548 @@
   xConfirmPara( m_uiQuadtreeTUMaxDepthIntra < 1,                                                         "QuadtreeTUMaxDepthIntra must be greater than or equal to 1" );
   xConfirmPara( m_uiQuadtreeTUMaxDepthIntra > m_uiQuadtreeTULog2MaxSize - m_uiQuadtreeTULog2MinSize + 1, "QuadtreeTUMaxDepthIntra must be less than or equal to the difference between QuadtreeTULog2MaxSize and QuadtreeTULog2MinSize plus 1" );
 
+  xConfirmPara(  m_uiMaxNumMergeCand < 1,  "MaxNumMergeCand must be 1 or greater.");
+  xConfirmPara(  m_uiMaxNumMergeCand > 5,  "MaxNumMergeCand must be 5 or smaller.");
+
 #if ADAPTIVE_QP_SELECTION
   xConfirmPara( m_bUseAdaptQpSelect == true && m_iQP < 0,                                              "AdaptiveQpSelection must be disabled when QP < 0.");
   xConfirmPara( m_bUseAdaptQpSelect == true && (m_cbQpOffset !=0 || m_crQpOffset != 0 ),               "AdaptiveQpSelection must be disabled when ChromaQpOffset is not equal to 0.");
@@ -1002 +1007 @@
     printf("TargetBitrate                : %d\n", m_targetBitrate);
     printf("NumLCUInUnit                 : %d\n", m_numLCUInUnit);
   }
+  printf("Max Num Merge Candidates     : %d\n", m_uiMaxNumMergeCand);
   printf("\n");
   
   printf("TOOL CFG: ");

App/TAppEncoder/TAppEncCfg.h

@@ -200 +200 @@
   Bool      m_useWeightedBiPred;                                    ///< Use of Bi-Directional Weighting Prediction (B_SLICE)
   
   UInt      m_log2ParallelMergeLevel;                 ///< Parallel merge estimation region
+  UInt      m_uiMaxNumMergeCand;                      ///< Max number of merge candidates
 
   Int       m_TMVPModeId;
   Int       m_signHideFlag;

App/TAppEncoder/TAppEncTop.cpp

@@ -179 +179 @@
   m_cTEncTop.setPCMLog2MinSize          ( m_uiPCMLog2MinSize);
   m_cTEncTop.setUsePCM                       ( m_usePCM );
   m_cTEncTop.setPCMLog2MaxSize               ( m_pcmLog2MaxSize);
+  m_cTEncTop.setMaxNumMergeCand              ( m_uiMaxNumMergeCand );
+  
 
   //====== Weighted Prediction ========
   m_cTEncTop.setUseWP                   ( m_bUseWeightPred      );

Lib/TLibCommon/TComDataCU.cpp

@@ -3090 +3090 @@
       ++refcnt;
     }
   }
-  if (uiArrayAddr > MRG_MAX_NUM_CANDS_SIGNALED)
+  if (uiArrayAddr > getSlice()->getMaxNumMergeCand())
   {
-    uiArrayAddr = MRG_MAX_NUM_CANDS_SIGNALED;
+    uiArrayAddr = getSlice()->getMaxNumMergeCand();
   }
   numValidMergeCand = uiArrayAddr;
 }

Lib/TLibCommon/TComSlice.cpp

@@ -201 +201 @@
 
   m_aiNumRefIdx[REF_PIC_LIST_C]      = 0;
 
-  m_uiMaxNumMergeCand = MRG_MAX_NUM_CANDS_SIGNALED;
+  m_uiMaxNumMergeCand = 5;
 
   m_bFinalized=false;
 

Lib/TLibCommon/TypeDef.h

@@ -140 +140 @@
 #define MAX_NUM_PPS                256
 #define MAX_NUM_APS                32         //< !!!KS: number not defined in WD yet
 
-#define MRG_MAX_NUM_CANDS_SIGNALED         5   //<G091: value of maxNumMergeCand signaled in slice header 
 
 #define WEIGHTED_CHROMA_DISTORTION  1   ///< F386: weighting of chroma for RDO
 #define RDOQ_CHROMA_LAMBDA          1   ///< F386: weighting of chroma for RDOQ

Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1352 +1352 @@
 
   READ_UVLC( uiCode, "5_minus_max_num_merge_cand");
   rpcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - uiCode);
-  assert(rpcSlice->getMaxNumMergeCand()==MRG_MAX_NUM_CANDS_SIGNALED);
 
   if (!bDependentSlice)
   {

Lib/TLibEncoder/TEncCavlc.cpp

@@ -919 +919 @@
 
   // !!!! sytnax elements not in the WD !!!!
   
-  assert(pcSlice->getMaxNumMergeCand()<=MRG_MAX_NUM_CANDS_SIGNALED);
-  assert(MRG_MAX_NUM_CANDS_SIGNALED<=MRG_MAX_NUM_CANDS);
+  assert(pcSlice->getMaxNumMergeCand()<=MRG_MAX_NUM_CANDS);
   WRITE_UVLC(MRG_MAX_NUM_CANDS - pcSlice->getMaxNumMergeCand(), "maxNumMergeCand");
 
 #if !REMOVE_ALF

Lib/TLibEncoder/TEncCfg.h

@@ -239 +239 @@
   Bool      m_bUseWeightPred;       //< Use of Weighting Prediction (P_SLICE)
   Bool      m_useWeightedBiPred;    //< Use of Bi-directional Weighting Prediction (B_SLICE)
   UInt      m_log2ParallelMergeLevelMinus2;       // Parallel merge estimation region
+  UInt      m_uiMaxNumMergeCand;                  ///< Maximum number of merge candidates
   Int       m_useScalingListId;            ///< Using quantization matrix i.e. 0=off, 1=default, 2=file.
   char*     m_scalingListFile;          ///< quantization matrix file name
   Int       m_TMVPModeId;
@@ -559 +560 @@
   Bool      getWPBiPred            ()            { return m_useWeightedBiPred; }
   Void      setLog2ParallelMergeLevelMinus2   ( UInt u )    { m_log2ParallelMergeLevelMinus2       = u;    }
   UInt      getLog2ParallelMergeLevelMinus2   ()            { return m_log2ParallelMergeLevelMinus2;       }
+  Void      setMaxNumMergeCand              ( UInt u )      { m_uiMaxNumMergeCand = u;      }
+  UInt      getMaxNumMergeCand              ()      { return m_uiMaxNumMergeCand;  }
   Void      setUseScalingListId    ( Int  u )    { m_useScalingListId       = u;   }
   Int       getUseScalingListId    ()            { return m_useScalingListId;      }
   Void      setScalingListFile     ( char*  pch ){ m_scalingListFile     = pch; }

Lib/TLibEncoder/TEncSearch.cpp

@@ -3128 +3128 @@
 
       xGetInterPredictionError( pcCU, pcYuvOrg, iPUIdx, uiCostCand, m_pcEncCfg->getUseHADME() );
       uiBitsCand = uiMergeCand + 1;
-      if (uiMergeCand == MRG_MAX_NUM_CANDS_SIGNALED -1)
+      if (uiMergeCand == m_pcEncCfg->getMaxNumMergeCand() -1)
       {
          uiBitsCand--;
       }

Lib/TLibEncoder/TEncSlice.cpp

@@ -402 +402 @@
   rpcSlice->setSliceArgument        ( m_pcCfg->getSliceArgument()        );
   rpcSlice->setDependentSliceMode     ( m_pcCfg->getDependentSliceMode()     );
   rpcSlice->setDependentSliceArgument ( m_pcCfg->getDependentSliceArgument() );
-  rpcSlice->setMaxNumMergeCand      (MRG_MAX_NUM_CANDS_SIGNALED);
+  rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand() );
   xStoreWPparam( pPPS->getUseWP(), pPPS->getWPBiPred() );
 }