Changeset 1119 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

7 Jul 2015, 01:55:11 (9 years ago)

Author:

seregin

Message:

macro cleanup: O0096_REP_FORMAT_INDEX

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (4 diffs)

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

@@ -3277 +3277 @@
   if( vps->getRepFormatIdxPresentFlag() )
   {
-#if O0096_REP_FORMAT_INDEX
 #if !VPS_EXTN_UEV_CODING
     READ_CODE( 8, uiCode, "vps_num_rep_formats_minus1" );
@@ -3283 +3282 @@
     READ_UVLC( uiCode, "vps_num_rep_formats_minus1" );
 #endif
-#else
-    READ_CODE( 4, uiCode, "vps_num_rep_formats_minus1" );
-#endif
+
     vps->setVpsNumRepFormats( uiCode + 1 );
   }
@@ -3312 +3309 @@
       if( vps->getVpsNumRepFormats() > 1 )
       {
-#if O0096_REP_FORMAT_INDEX
 #if !VPS_EXTN_UEV_CODING
         READ_CODE( 8, uiCode, "vps_rep_format_idx[i]" );
@@ -3323 +3319 @@
         READ_CODE( numBits, uiCode, "vps_rep_format_idx[i]" );
 #endif
-#else
-        READ_CODE( 4, uiCode, "vps_rep_format_idx[i]" );
-#endif
+
         vps->setVpsRepFormatIdx( i, uiCode );
       }