Changeset 1207 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

8 Jul 2015, 21:16:48 (10 years ago)

Author:

seregin

Message:

macro cleanup: POC_RESET_IDC_SIGNALLING

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (7 diffs)
• TEncCavlc.h (modified) (1 diff)
• TEncEntropy.cpp (modified) (1 diff)
• TEncEntropy.h (modified) (4 diffs)
• TEncGOP.cpp (modified) (1 diff)
• TEncSbac.cpp (modified) (1 diff)
• TEncSbac.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1306 +1306 @@
     }
   }
-
-#if !POC_RESET_IDC_SIGNALLING   // Wrong place to put slice header extension
-  if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag())
-  {
-    WRITE_UVLC(0,"slice_header_extension_length");
-  }
-#endif
 }
 
@@ -1835 +1828 @@
 
 #if SVC_EXTENSION
-
-#if POC_RESET_IDC_SIGNALLING
-Void  TEncCavlc::codeSliceHeaderExtn( TComSlice* slice, Int shBitsWrittenTillNow )
+Void TEncCavlc::codeSliceHeaderExtn( TComSlice* slice, Int shBitsWrittenTillNow )
 {
   Int tmpBitsBeforeWriting = getNumberOfWrittenBits();
@@ -1851 +1842 @@
     // Determine value of SH extension length.
     Int shExtnLengthInBit = 0;
-    if (slice->getPPS()->getPocResetInfoPresentFlag())
+    if( slice->getPPS()->getPocResetInfoPresentFlag() )
     {
       shExtnLengthInBit += 2;
     }
-    if (slice->getPocResetIdc() > 0)
+
+    if( slice->getPocResetIdc() > 0 )
     {
       shExtnLengthInBit += 6;
     }
-    if (slice->getPocResetIdc() == 3)
+
+    if( slice->getPocResetIdc() == 3 )
     {
       shExtnLengthInBit += (slice->getSPS()->getBitsForPOC() + 1);
     }
 
-    if (!slice->getPocMsbValRequiredFlag() && slice->getVPS()->getVpsPocLsbAlignedFlag())
+    if( !slice->getPocMsbValRequiredFlag() && slice->getVPS()->getVpsPocLsbAlignedFlag() )
     {
       shExtnLengthInBit++;
@@ -1880 +1873 @@
     }
 
-    if (slice->getPocMsbNeeded())
+    if( slice->getPocMsbNeeded() )
     {
       slice->setPocMsbValPresentFlag(true);
     }
 
-    if (slice->getPocMsbValPresentFlag())
+    if( slice->getPocMsbValPresentFlag() )
     {
       UInt lengthVal = 1;
@@ -1897 +1890 @@
       shExtnLengthInBit += lengthVal;
     }
+
     Int shExtnAdditionalBits = 0;
-    if(shExtnLengthInBit % 8 != 0)
+
+    if( shExtnLengthInBit % 8 != 0 )
     {
       shExtnAdditionalBits = 8 - (shExtnLengthInBit % 8);
     }
+
     Int shExtnLength = (shExtnLengthInBit + shExtnAdditionalBits) / 8;
     WRITE_UVLC( shExtnLength, "slice_header_extension_length" );
 
-    if(slice->getPPS()->getPocResetInfoPresentFlag())
+    if( slice->getPPS()->getPocResetInfoPresentFlag() )
     {
       WRITE_CODE( slice->getPocResetIdc(), 2,                                 "poc_reset_idc");
     }
-    if(slice->getPocResetIdc() > 0)
+    if( slice->getPocResetIdc() > 0 )
     {
       WRITE_CODE( slice->getPocResetPeriodId(), 6,                            "poc_reset_period_id");
     }
-    if(slice->getPocResetIdc() == 3) 
+    if( slice->getPocResetIdc() == 3 ) 
     {
       WRITE_FLAG( slice->getFullPocResetFlag() ? 1 : 0,                       "full_poc_reset_flag");
@@ -1930 +1926 @@
     }
 
-    for (Int i = 0; i < shExtnAdditionalBits; i++)
+    for(Int i = 0; i < shExtnAdditionalBits; i++)
     {
       WRITE_FLAG( 1, "slice_segment_header_extension_data_bit");
@@ -1940 +1936 @@
   // Slice header byte_alignment() included in xAttachSliceDataToNalUnit
 }
-#endif
 
 Void TEncCavlc::codeVPSExtension (TComVPS *vps)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h

@@ -154 +154 @@
 
 #if SVC_EXTENSION
-#if POC_RESET_IDC_SIGNALLING
   Void  codeSliceHeaderExtn( TComSlice* slice, Int shBitsWrittenTillNow );
-#endif
   Void codeSPSExtension        ( TComSPS* pcSPS );
   Void codeVPSExtension        ( TComVPS* pcVPS );

branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -747 +747 @@
 }
 
-#if POC_RESET_IDC_SIGNALLING
-Void  TEncEntropy::encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )
+#if SVC_EXTENSION
+Void TEncEntropy::encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )
 {
   m_pcEntropyCoderIf->codeSliceHeaderExtn( pSlice, shBitsWrittenTillNow );

branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.h

@@ -85 +85 @@
   virtual Void codeScalingList   ( TComScalingList* scalingList )      = 0;
 
-#if POC_RESET_IDC_SIGNALLING
-  virtual Void codeSliceHeaderExtn     ( TComSlice* pSlice, Int shBitsWrittenTillNow )     = 0;
-#endif
-
 public:
   virtual Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
@@ -120 +116 @@
   virtual Void codeTransformSkipFlags ( TComTU &rTu, ComponentID component ) = 0;
 #if SVC_EXTENSION
+  virtual Void codeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )     = 0;
   virtual Void codeSAOBlkParam   (SAOBlkParam& saoBlkParam, UInt* saoMaxOffsetQVal, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail, Bool onlyEstMergeInfo = false)    =0;
 #else
@@ -151 +148 @@
   TEncEntropyIf*      m_pcEntropyCoderIf;
 
-#if POC_RESET_IDC_SIGNALLING
-  Void    encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow );
-#endif
 public:
   Void encodeVPS               ( TComVPS* pcVPS);
@@ -204 +198 @@
   Void estimateBit             ( estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType );
 #if SVC_EXTENSION
+  Void encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow );
   Void encodeSAOBlkParam(SAOBlkParam& saoBlkParam, UInt* saoMaxOffsetQVal, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail){m_pcEntropyCoderIf->codeSAOBlkParam(saoBlkParam, saoMaxOffsetQVal, sliceEnabled, leftMergeAvail, aboveMergeAvail, false);}
 #else

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -2949 +2949 @@
         m_pcEntropyCoder->setEntropyCoder   ( m_pcCavlcCoder, pcSlice );
         m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
-#if POC_RESET_IDC_SIGNALLING
+#if SVC_EXTENSION
         tmpBitsBeforeWriting = m_pcEntropyCoder->getNumberOfWrittenBits();
         m_pcEntropyCoder->encodeTilesWPPEntryPoint( pcSlice );

branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -2028 +2028 @@
 }
 
-#if POC_RESET_IDC_SIGNALLING
-Void  TEncSbac::codeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )
+#if SVC_EXTENSION
+Void TEncSbac::codeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )
 {
   assert (0);

branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.h

@@ -106 +106 @@
 
 #if SVC_EXTENSION
-#if POC_RESET_IDC_SIGNALLING
   Void  codeSliceHeaderExtn     ( TComSlice* pSlice, Int shBitsWrittenTillNow );
-#endif  
-  Void codeSAOOffsetParam(ComponentID compIdx, SAOOffset& ctbParam, Bool sliceEnabled, UInt* saoMaxOffsetQVal);
-  Void codeSAOBlkParam(SAOBlkParam& saoBlkParam
+  Void  codeSAOOffsetParam(ComponentID compIdx, SAOOffset& ctbParam, Bool sliceEnabled, UInt* saoMaxOffsetQVal);
+  Void  codeSAOBlkParam(SAOBlkParam& saoBlkParam
                     , UInt* saoMaxOffsetQVal
                     , Bool* sliceEnabled