Changeset 1121 in SHVCSoftware

Timestamp:

7 Jul 2015, 02:05:04 (9 years ago)

Author:

seregin

Message:

macro cleanup: Q0195_REP_FORMAT_CLEANUP

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -155 +155 @@
   vps->setVpsNumRepFormats                                                ( maxRepFormatIdx + 1 );
 
-#if Q0195_REP_FORMAT_CLEANUP
   // When not present, the value of rep_format_idx_present_flag is inferred to be equal to 0
   vps->setRepFormatIdxPresentFlag                                         ( vps->getVpsNumRepFormats() > 1 ? true : false );
-#else
-  vps->setRepFormatIdxPresentFlag                                         ( true );
-#endif
 
   for(UInt idx=0; idx < vps->getVpsNumRepFormats(); idx++)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -1993 +1993 @@
 , m_picRatePresentVpsFlag     (false)
 #if REPN_FORMAT_IN_VPS
-#if Q0195_REP_FORMAT_CLEANUP
 , m_repFormatIdxPresentFlag   (false)
-#else
-, m_repFormatIdxPresentFlag   (true)
-#endif
 , m_vpsNumRepFormats          (1)
 #endif

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -188 +188 @@
 #define O0096_DEFAULT_DEPENDENCY_TYPE    1      ///< JCTVC-O0096: specify default dependency type for all direct reference layers
 
-#define Q0195_REP_FORMAT_CLEANUP         1      ///< JCTVC-Q0195: restructureing of rep_format() signaling
-
 #define RESAMPLING_CONSTRAINT_BUG_FIX    1
 #define O0098_SCALED_REF_LAYER_ID        1      ///< JCTVC-O0098: signal scaled reference id

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1639 +1639 @@
       {
         format = pcSlice->getVPS()->getVpsRepFormat( sps->getUpdateRepFormatFlag() ? sps->getUpdateRepFormatIndex() : pcSlice->getVPS()->getVpsRepFormatIdx( pcSlice->getVPS()->getLayerIdxInVps(sps->getLayerId()) ) )->getChromaFormatVpsIdc();
-#if Q0195_REP_FORMAT_CLEANUP
-        assert( (sps->getUpdateRepFormatFlag()==false && pcSlice->getVPS()->getVpsNumRepFormats()==1) || pcSlice->getVPS()->getVpsNumRepFormats() > 1 ); //conformance check
-#endif
+
+        // conformance check
+        assert( (sps->getUpdateRepFormatFlag()==false && pcSlice->getVPS()->getVpsNumRepFormats()==1) || pcSlice->getVPS()->getVpsNumRepFormats() > 1 ); 
       }
       if (format != CHROMA_400)
@@ -3223 +3223 @@
 
 #if REPN_FORMAT_IN_VPS
-#if Q0195_REP_FORMAT_CLEANUP
   READ_UVLC( uiCode, "vps_num_rep_formats_minus1" );
   vps->setVpsNumRepFormats( uiCode + 1 );
@@ -3271 +3270 @@
     }
   }
-#else
-  READ_FLAG( uiCode, "rep_format_idx_present_flag");
-  vps->setRepFormatIdxPresentFlag( uiCode ? true : false );
-
-  if( vps->getRepFormatIdxPresentFlag() )
-  {
-#if !VPS_EXTN_UEV_CODING
-    READ_CODE( 8, uiCode, "vps_num_rep_formats_minus1" );
-#else
-    READ_UVLC( uiCode, "vps_num_rep_formats_minus1" );
-#endif
-
-    vps->setVpsNumRepFormats( uiCode + 1 );
-  }
-  else
-  {
-    // default assignment
-    assert (vps->getMaxLayers() <= 16);       // If max_layers_is more than 15, num_rep_formats has to be signaled
-    vps->setVpsNumRepFormats( vps->getMaxLayers() );
-  }
-
-  // The value of vps_num_rep_formats_minus1 shall be in the range of 0 to 255, inclusive.
-  assert( vps->getVpsNumRepFormats() > 0 && vps->getVpsNumRepFormats() <= 256 );
-
-  for(i = 0; i < vps->getVpsNumRepFormats(); i++)
-  {
-    // Read rep_format_structures
-    parseRepFormat( vps->getVpsRepFormat(i), i > 0 ? vps->getVpsRepFormat(i-1) : 0 );
-  }
-
-  // Default assignment for layer 0
-  vps->setVpsRepFormatIdx( 0, 0 );
-  if( vps->getRepFormatIdxPresentFlag() )
-  {
-    for(i = 1; i < vps->getMaxLayers(); i++)
-    {
-      if( vps->getVpsNumRepFormats() > 1 )
-      {
-#if !VPS_EXTN_UEV_CODING
-        READ_CODE( 8, uiCode, "vps_rep_format_idx[i]" );
-#else
-        Int numBits = 1;
-        while ((1 << numBits) < (vps->getVpsNumRepFormats()))
-        {
-          numBits++;
-        }
-        READ_CODE( numBits, uiCode, "vps_rep_format_idx[i]" );
-#endif
-
-        vps->setVpsRepFormatIdx( i, uiCode );
-      }
-      else
-      {
-        // default assignment - only one rep_format() structure
-        vps->setVpsRepFormatIdx( i, 0 );
-      }
-    }
-  }
-  else
-  {
-    // default assignment - each layer assigned each rep_format() structure in the order signaled
-    for(i = 1; i < vps->getMaxLayers(); i++)
-    {
-      vps->setVpsRepFormatIdx( i, i );
-    }
-  }
-#endif
-#endif
+#endif
+
   READ_FLAG(uiCode, "max_one_active_ref_layer_flag" );
   vps->setMaxOneActiveRefLayerFlag(uiCode);

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

@@ -2279 +2279 @@
 
 #if REPN_FORMAT_IN_VPS
-#if Q0195_REP_FORMAT_CLEANUP  
   // The value of vps_num_rep_formats_minus1 shall be in the range of 0 to 255, inclusive.
   assert( vps->getVpsNumRepFormats() > 0 && vps->getVpsNumRepFormats() <= 256 );
@@ -2313 +2312 @@
     }
   }
-#else
-  WRITE_FLAG( vps->getRepFormatIdxPresentFlag(), "rep_format_idx_present_flag"); 
-
-  if( vps->getRepFormatIdxPresentFlag() )
-  {
-    // The value of vps_num_rep_formats_minus1 shall be in the range of 0 to 255, inclusive.
-    assert( vps->getVpsNumRepFormats() > 0 && vps->getVpsNumRepFormats() <= 256 );
-
-#if !VPS_EXTN_UEV_CODING
-    WRITE_CODE( vps->getVpsNumRepFormats() - 1, 8, "vps_num_rep_formats_minus1" );
-#else
-    WRITE_UVLC( vps->getVpsNumRepFormats() - 1, "vps_num_rep_formats_minus1" );
-#endif
-
-  }
-  for(i = 0; i < vps->getVpsNumRepFormats(); i++)
-  {
-    // Read rep_format_structures
-    codeRepFormat( vps->getVpsRepFormat(i) );
-  }
-  
-  if( vps->getRepFormatIdxPresentFlag() )
-  {
-    for(i = 1; i < vps->getMaxLayers(); i++)
-    {
-      if( vps->getVpsNumRepFormats() > 1 )
-      {
-#if !VPS_EXTN_UEV_CODING
-        WRITE_CODE( vps->getVpsRepFormatIdx(i), 8, "vps_rep_format_idx[i]" );
-#else
-        Int numBits = 1;
-        while ((1 << numBits) < (vps->getVpsNumRepFormats()))
-        {
-          numBits++;
-        }
-        WRITE_CODE( vps->getVpsRepFormatIdx(i), numBits, "vps_rep_format_idx[i]" );
-#endif
-
-      }
-    }
-  }
-#endif
-#endif //REPN_FORMAT_IN_VPS
+#endif
 
   WRITE_FLAG(vps->getMaxOneActiveRefLayerFlag(), "max_one_active_ref_layer_flag");