Ticket #645: RPS_COUNTER_BUGFIX_r2613.patch

App/TAppDecoder/TAppDecTop.cpp

@@ -197 +197 @@
 #if RPS_COUNTER
   printf("\nRPS related bits in SPS: %d\n", m_cTDecTop.getSPS()->getBitsForSPS());
   printf("RPS related bits in PPS: %d\n", m_cTDecTop.getPPS()->getBitsForPPS());
+#if RPS_COUNTER_BUGFIX
+  int shbits = (m_cTDecTop.getPPS()->getBitsForSliceHeader()+2); //The first intra costs 2 bits.
+#else
   int shbits = (m_cTDecTop.getPPS()->getBitsForSliceHeader()+2)/2; //All slice headers except for the first intra picture are counted twice. The first intra costs 2 bits.
+#endif
   printf("RPS related bits in slice headers: %d\n", shbits);
   printf("RPS related bits in total: %d\n\n",m_cTDecTop.getPPS()->getBitsForPPS()+m_cTDecTop.getSPS()->getBitsForSPS()+shbits);
 #endif

Lib/TLibCommon/TComSlice.h

@@ -301 +301 @@
   UInt        m_tilesOrEntropyCodingSyncIdc;
   Int         m_numSubstreams;
 #endif
+#if RPS_COUNTER_BUGFIX
+  Bool m_firstRunFlag;
+#endif
 
 public:
   TComSPS();
   virtual ~TComSPS();
-
+#if RPS_COUNTER_BUGFIX
+  Void        setFirstRunFlag(Bool x)       { m_firstRunFlag = x;}
+  Bool        getFirstRunFlag()             { return m_firstRunFlag;}
+  Void        flipFirstRunFlag()            { m_firstRunFlag = !m_firstRunFlag;}
+#endif
   Int  getSPSId       ()         { return m_SPSId;          }
   Void setSPSId       (Int i)    { m_SPSId = i;             }
   Int  getProfileIdc  ()         { return m_ProfileIdc;     }

Lib/TLibCommon/TypeDef.h

@@ -40 +40 @@
 
 //! \ingroup TLibCommon
 //! \{
-
+#define RPS_COUNTER_BUGFIX               1  ///< To fix the bug in bit count of RPS-related parameters in the slice header 
 #define REMOVE_TILE_MARKERS              1
 #define EXPLICITLY_SIGNAL_ENTRY_POINTS   1  ///< I0273: Explicitly signal all tiles/wavefront entry points
 

Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1737 +1737 @@
 #endif
     }
 #if RPS_COUNTER
+#if RPS_COUNTER_BUGFIX
+     rpcSlice->getPPS()->setBitsForSliceHeader( (rpcSlice->getPPS()->getBitsForSliceHeader()+bitsBefore-m_pcBitstream->getNumBitsLeft()) * rpcSlice->getSPS()->getFirstRunFlag() );
+#else
     rpcSlice->getPPS()->setBitsForSliceHeader(rpcSlice->getPPS()->getBitsForSliceHeader()+bitsBefore-m_pcBitstream->getNumBitsLeft());
 #endif
+#endif
 #if DBL_HL_SYNTAX
     if(sps->getUseSAO() || sps->getUseALF())
 #else
@@ -1913 +1917 @@
       refPicListModification->setRefPicListModificationFlagL1(0);
     }
 #if RPS_COUNTER
+#if RPS_COUNTER_BUGFIX
+     rpcSlice->getPPS()->setBitsForSliceHeader( (rpcSlice->getPPS()->getBitsForSliceHeader()+bitsBefore-m_pcBitstream->getNumBitsLeft()) * rpcSlice->getSPS()->getFirstRunFlag() );
+#else
     rpcSlice->getPPS()->setBitsForSliceHeader(rpcSlice->getPPS()->getBitsForSliceHeader()+bitsBefore-m_pcBitstream->getNumBitsLeft());
 #endif
+#endif
   }
   else
   {

Lib/TLibDecoder/TDecTop.cpp

@@ -324 +324 @@
   {
     m_apcSlicePilot->copySliceInfo( pcPic->getPicSym()->getSlice(m_uiSliceIdx-1) );
   }
-
+#if RPS_COUNTER_BUGFIX
+  if(m_apcSlicePilot->getSliceCurStartCUAddr() == 0)
+  {
+    m_apcSlicePilot->getSPS()->flipFirstRunFlag();
+  }
+  else
+  {
+    m_apcSlicePilot->getSPS()->setFirstRunFlag(1);
+  }
+#endif
   m_apcSlicePilot->setNalUnitType(nalu.m_nalUnitType);
   m_apcSlicePilot->setReferenced(nalu.m_nalRefFlag);
   m_apcSlicePilot->setTLayerInfo(nalu.m_temporalId);