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

Timestamp:

8 Jul 2015, 01:45:57 (10 years ago)

Author:

seregin

Message:

macro cleanup: Q0078_ADD_LAYER_SETS

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (8 diffs)
• TEncGOP.cpp (modified) (2 diffs)
• TEncTop.cpp (modified) (3 diffs)
• TEncTop.h (modified) (2 diffs)

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

@@ -817 +817 @@
 
   WRITE_CODE( pcVPS->getMaxLayerId(), 6,                       "vps_max_layer_id" );
-#if Q0078_ADD_LAYER_SETS
   WRITE_UVLC(pcVPS->getVpsNumLayerSetsMinus1(),                "vps_num_layer_sets_minus1");
-  for (UInt opsIdx = 1; opsIdx <= pcVPS->getVpsNumLayerSetsMinus1(); opsIdx++)
-#else
-  WRITE_UVLC( pcVPS->getNumLayerSets() - 1,                 "vps_num_layer_sets_minus1" );
-  for (UInt opsIdx = 1; opsIdx <= (pcVPS->getNumLayerSets() - 1); opsIdx++)
-#endif
+
+  for( UInt opsIdx = 1; opsIdx <= pcVPS->getVpsNumLayerSetsMinus1(); opsIdx++ )
   {
     // Operation point set
@@ -2071 +2067 @@
   }
 
-#if Q0078_ADD_LAYER_SETS
-  if (vps->getNumIndependentLayers() > 1)
+  if( vps->getNumIndependentLayers() > 1 )
   {
     WRITE_UVLC( vps->getNumAddLayerSets(), "num_add_layer_sets" );
-    for (i = 0; i < vps->getNumAddLayerSets(); i++)
-    {
-      for (j = 1; j < vps->getNumIndependentLayers(); j++)
-      {
-        int len = 1;
-        while ((1 << len) < (vps->getNumLayersInTreePartition(j) + 1))
+
+    for( i = 0; i < vps->getNumAddLayerSets(); i++ )
+    {
+      for( j = 1; j < vps->getNumIndependentLayers(); j++ )
+      {
+        Int len = 1;
+        while( (1 << len) < (vps->getNumLayersInTreePartition(j) + 1) )
         {
           len++;
@@ -2088 +2084 @@
     }
   }
-#endif
 
   WRITE_FLAG( vps->getMaxTSLayersPresentFlag(), "vps_sub_layers_max_minus1_present_flag");
@@ -2162 +2157 @@
       WRITE_CODE( vps->getOutputLayerSetIdx(i) - 1, numBits, "layer_set_idx_for_ols_minus1"); 
     }
-#if Q0078_ADD_LAYER_SETS
-    if ( i > vps->getVpsNumLayerSetsMinus1() || vps->getDefaultTargetOutputLayerIdc() >= 2 ) //Instead of == 2, >= 2 is used to follow the agreement that value 3 should be interpreted as 2
-#else
-    if ( i > (vps->getNumLayerSets() - 1) || vps->getDefaultTargetOutputLayerIdc() >= 2 ) //Instead of == 2, >= 2 is used to follow the agreement that value 3 should be interpreted as 2
-#endif
-    {
-      for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet) ; j++ )
+
+    if( i > vps->getVpsNumLayerSetsMinus1() || vps->getDefaultTargetOutputLayerIdc() >= 2 ) //Instead of == 2, >= 2 is used to follow the agreement that value 3 should be interpreted as 2
+    {
+      for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
       {
         WRITE_FLAG( vps->getOutputLayerFlag(i,j), "output_layer_flag[i][j]");
@@ -2392 +2384 @@
   if( vps->getBitRatePresentVpsFlag() || vps->getPicRatePresentVpsFlag() )
   {
-#if Q0078_ADD_LAYER_SETS
     for( i = vps->getBaseLayerInternalFlag() ? 0 : 1; i < vps->getNumLayerSets(); i++ )
-#else
-    for( i = 0; i < vps->getNumLayerSets(); i++ )
-#endif
     {
       for( j = 0; j <= vps->getMaxSLayersInLayerSetMinus1(i); j++ )
@@ -2404 +2392 @@
           WRITE_FLAG( vps->getBitRatePresentFlag( i, j),        "bit_rate_present_flag[i][j]" );
         }
+
         if( vps->getPicRatePresentVpsFlag() )
         {
           WRITE_FLAG( vps->getPicRatePresentFlag( i, j),        "pic_rate_present_flag[i][j]" );
         }
+
         if( vps->getBitRatePresentFlag(i, j) )
         {
@@ -2413 +2403 @@
           WRITE_CODE( vps->getAvgBitRate( i, j ), 16, "max_bit_rate[i][j]" );
         }
+
         if( vps->getPicRatePresentFlag(i, j) )
         {
@@ -2539 +2530 @@
         codeHrdParameters(vps->getBspHrd(i), i==0 ? 1 : vps->getBspCprmsPresentFlag(i), vps->getMaxTLayers()-1);
       }
-#if Q0078_ADD_LAYER_SETS
       for( UInt h = 1; h <= vps->getVpsNumLayerSetsMinus1(); h++ )
-#else
-      for( UInt h = 1; h <= (vps->getNumLayerSets()-1); h++ )
-#endif
       {
         WRITE_UVLC( vps->getNumBitstreamPartitions(h), "num_bitstream_partitions[i]");

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

@@ -2370 +2370 @@
 #if SVC_EXTENSION
       nalu = NALUnit(NAL_UNIT_SPS, 0, m_layerId);
+
+      if( m_pcEncTop->getVPS()->getNumDirectRefLayers(m_layerId) == 0 && m_pcEncTop->getVPS()->getNumAddLayerSets() > 0 )
+      {
+        // For independent base layer rewriting
+        nalu.m_layerId = 0; 
+      }
 #else
       nalu = NALUnit(NAL_UNIT_SPS);
 #endif
-#if Q0078_ADD_LAYER_SETS
-      if (m_pcEncTop->getVPS()->getNumDirectRefLayers(m_layerId) == 0 && m_pcEncTop->getVPS()->getNumAddLayerSets() > 0)
-      {
-        nalu.m_layerId = 0; // For independent base layer rewriting
-      }
-#endif
+
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
       if (m_bSeqFirst)
@@ -2415 +2416 @@
 #if SVC_EXTENSION
       nalu = NALUnit(NAL_UNIT_PPS, 0, m_layerId);
+
+      if( m_pcEncTop->getVPS()->getNumDirectRefLayers(m_layerId) == 0 && m_pcEncTop->getVPS()->getNumAddLayerSets() > 0 )
+      {
+        // For independent base layer rewriting
+        nalu.m_layerId = 0;
+      }
 #else
       nalu = NALUnit(NAL_UNIT_PPS);
 #endif
-#if Q0078_ADD_LAYER_SETS
-      if (m_pcEncTop->getVPS()->getNumDirectRefLayers(m_layerId) == 0 && m_pcEncTop->getVPS()->getNumAddLayerSets() > 0)
-      {
-        nalu.m_layerId = 0; // For independent base layer rewriting
-      }
-#endif
+
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
 #if O0092_0094_DEPENDENCY_CONSTRAINT

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

@@ -743 +743 @@
   m_cSPS.setNumDirectRefLayers(m_numDirectRefLayers);
 #endif
-#if Q0078_ADD_LAYER_SETS
+
   if( !m_numDirectRefLayers && m_numAddLayerSets )
   {
@@ -752 +752 @@
     m_cSPS.setLayerId(m_layerId);
   }
-#else
-  m_cSPS.setLayerId(m_layerId);
-#endif
 #endif //SVC_EXTENSION
+
   ProfileTierLevel& profileTierLevel = *m_cSPS.getPTL()->getGeneralPTL();
   profileTierLevel.setLevelIdc(m_level);
@@ -1029 +1027 @@
 #endif
 
-#if Q0078_ADD_LAYER_SETS
   if( !m_numDirectRefLayers && m_numAddLayerSets )
   {
     m_cPPS.setLayerId(0); // layer ID 0 for independent layers
   }
-#endif
 
   if( m_layerId > 0 )

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

@@ -147 +147 @@
   Bool                    m_interLayerWeightedPredFlag;
 #endif
-#if Q0078_ADD_LAYER_SETS
-  int                     m_numAddLayerSets;
-#endif
+  Int                     m_numAddLayerSets;
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Bool                    m_pocDecrementedInDPBFlag;
@@ -270 +268 @@
   Void      setNoOutputOfPriorPicsFlags(Bool x)   { m_noOutputOfPriorPicsFlags = x;   }
 #endif
-#if Q0078_ADD_LAYER_SETS
   Void      setNumAddLayerSets(Int x)             { m_numAddLayerSets = x; }
   Int       getNumAddLayerSets()                  { return m_numAddLayerSets; }
-#endif
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Void      setPocDecrementedInDPBFlag(Bool x)    { m_pocDecrementedInDPBFlag = x; }