Ticket #454: num_ref_idx_default_active.patch

source/Lib/TLibCommon/TComSlice.cpp

@@ -1457 +1457 @@
 , m_uiMinCuDQPSize              (0)
 , m_iChromaQpOffset             (0)
 , m_iChromaQpOffset2nd          (0)
+, m_uiNumRefIdxL0DefaultActive  (1)
+, m_uiNumRefIdxL1DefaultActive  (1)
 #if !RPS_IN_SPS
 , m_bLongTermRefsPresent        (false)
 #endif

source/Lib/TLibCommon/TComSlice.h

@@ -624 +624 @@
   Int        m_iChromaQpOffset;
   Int        m_iChromaQpOffset2nd;
 
+  UInt        m_uiNumRefIdxL0DefaultActive;
+  UInt        m_uiNumRefIdxL1DefaultActive;
+
 #if !RPS_IN_SPS
   Bool        m_bLongTermRefsPresent;
 #endif
@@ -724 +727 @@
   Void      setChromaQpOffset2nd( Int i ) { m_iChromaQpOffset2nd = i; }
   Int       getChromaQpOffset2nd() { return m_iChromaQpOffset2nd;}
 
+  Void      setNumRefIdxL0DefaultActive(UInt ui)    { m_uiNumRefIdxL0DefaultActive=ui;     }
+  UInt      getNumRefIdxL0DefaultActive()           { return m_uiNumRefIdxL0DefaultActive; }
+  Void      setNumRefIdxL1DefaultActive(UInt ui)    { m_uiNumRefIdxL1DefaultActive=ui;     }
+  UInt      getNumRefIdxL1DefaultActive()           { return m_uiNumRefIdxL1DefaultActive; }
+
   Bool getUseWP                     ()          { return m_bUseWeightPred;  }
   UInt getWPBiPredIdc               ()          { return m_uiBiPredIdc;     }
 

source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1185 +1185 @@
   }
 #endif
   
-  // num_ref_idx_l0_default_active_minus1
-  // num_ref_idx_l1_default_active_minus1
+  READ_CODE(3,uiCode, "num_ref_idx_l0_default_active_minus1");     pcPPS->setNumRefIdxL0DefaultActive(uiCode+1);
+  READ_CODE(3,uiCode, "num_ref_idx_l1_default_active_minus1");     pcPPS->setNumRefIdxL1DefaultActive(uiCode+1);
+
   READ_SVLC(iCode, "pic_init_qp_minus26" );                        pcPPS->setPicInitQPMinus26(iCode);
   READ_FLAG( uiCode, "constrained_intra_pred_flag" );              pcPPS->setConstrainedIntraPred( uiCode ? true : false );
   READ_FLAG( uiCode, "enable_temporal_mvp_flag" );                 pcPPS->setEnableTMVPFlag( uiCode ? true : false );
@@ -1809 +1810 @@
       }
       else
       {
-        rpcSlice->setNumRefIdx(REF_PIC_LIST_0, 0);
-        rpcSlice->setNumRefIdx(REF_PIC_LIST_1, 0);
+        rpcSlice->setNumRefIdx(REF_PIC_LIST_0, rpcSlice->getPPS()->getNumRefIdxL0DefaultActive());
+        if (rpcSlice->isInterB())
+        {
+          rpcSlice->setNumRefIdx(REF_PIC_LIST_1, rpcSlice->getPPS()->getNumRefIdxL1DefaultActive());
+        }
+        else
+        {
+          rpcSlice->setNumRefIdx(REF_PIC_LIST_1,0);
+        }
       }
     }
     // }

source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -299 +299 @@
     WRITE_FLAG( pcPPS->getTLayerSwitchingFlag( i ) ? 1 : 0 , "temporal_layer_switching_point_flag" ); 
   }
 #endif
-  //   num_ref_idx_l0_default_active_minus1
-  //   num_ref_idx_l1_default_active_minus1
+  WRITE_CODE( pcPPS->getNumRefIdxL0DefaultActive()-1, 3, "num_ref_idx_l0_default_active_minus1");
+  WRITE_CODE( pcPPS->getNumRefIdxL1DefaultActive()-1, 3, "num_ref_idx_l1_default_active_minus1");
+
   WRITE_SVLC( pcPPS->getPicInitQPMinus26(),                  "pic_init_qp_minus26");
   WRITE_FLAG( pcPPS->getConstrainedIntraPred() ? 1 : 0,      "constrained_intra_pred_flag" );
   WRITE_FLAG( pcPPS->getEnableTMVPFlag() ? 1 : 0,            "enable_temporal_mvp_flag" );
@@ -745 +746 @@
       WRITE_UVLC( pcSlice->getAPS()->getAPSID(), "aps_id");
     }
 
-    // we always set num_ref_idx_active_override_flag equal to one. this might be done in a more intelligent way 
+    //check if numrefidxes match the defaults. If not, override
+    Bool bOverride = (pcSlice->getNumRefIdx( REF_PIC_LIST_0 )!=pcSlice->getPPS()->getNumRefIdxL0DefaultActive()||(pcSlice->isInterB()&&pcSlice->getNumRefIdx( REF_PIC_LIST_1 )!=pcSlice->getPPS()->getNumRefIdxL1DefaultActive()));
     if (!pcSlice->isIntra())
     {
-      WRITE_FLAG( 1 ,                                             "num_ref_idx_active_override_flag");
-      WRITE_CODE( pcSlice->getNumRefIdx( REF_PIC_LIST_0 ) - 1, 3, "num_ref_idx_l0_active_minus1" );
+      if (bOverride) 
+      {
+        WRITE_FLAG( 1 ,                                             "num_ref_idx_active_override_flag");
+        WRITE_CODE( pcSlice->getNumRefIdx( REF_PIC_LIST_0 ) - 1, 3, "num_ref_idx_l0_active_minus1" );
+      }
+      else
+      {
+        WRITE_FLAG( 0 ,                                             "num_ref_idx_active_override_flag");
+      }
     }
     else
     {
@@ -757 +766 @@
     }
     if (pcSlice->isInterB())
     {
-      WRITE_CODE( pcSlice->getNumRefIdx( REF_PIC_LIST_1 ) - 1, 3, "num_ref_idx_l1_active_minus1" );
+      if(bOverride) 
+      {
+        WRITE_CODE( pcSlice->getNumRefIdx( REF_PIC_LIST_1 ) - 1, 3, "num_ref_idx_l1_active_minus1" );
+      }
     }
     else
     {

source/Lib/TLibEncoder/TEncTop.cpp

@@ -722 +722 @@
 #if CABAC_INIT_FLAG
   m_cPPS.setCabacInitPresentFlag(CABAC_INIT_PRESENT_FLAG);
 #endif
+
+  Int histogram[8];
+  for(Int i=0; i<8; i++)
+  {
+    histogram[i]=0;
+  }
+  for( Int i = 0; i < getGOPSize(); i++) 
+  {
+    if(getGOPEntry(i).m_numRefPicsActive<8)
+      histogram[getGOPEntry(i).m_numRefPicsActive]++;
+  }
+  Int maxHist=-1;
+  Int bestPos=0;
+  for(Int i=0; i<8; i++)
+  {
+    if(histogram[i]>maxHist)
+    {
+      maxHist=histogram[i];
+      bestPos=i;
+    }
+  }
+  m_cPPS.setNumRefIdxL0DefaultActive(bestPos);
+  m_cPPS.setNumRefIdxL1DefaultActive(bestPos);
 }
 
 //Function for initializing m_RPSList, a list of TComReferencePictureSet, based on the GOPEntry objects read from the config file.