Changeset 1165 in SHVCSoftware

Timestamp:

8 Jul 2015, 01:08:07 (9 years ago)

Author:

seregin

Message:

macro cleanup: P0307_VPS_NON_VUI_EXT_UPDATE

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -72 +72 @@
 
 #define P0130_EOB                        1      ///< JCTVC-P0130, set layer Id of EOB NALU to be fixed to 0
-#define P0307_VPS_NON_VUI_EXT_UPDATE     1      ///< JCTVC-P0307, implementation related to NON VUI VPS Extension signalling
 
 #define DISCARDABLE_PIC_RPS              1      ///< JCTVC-P0130: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1

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

@@ -3151 +3151 @@
   assert( vps->getVpsNonVuiExtLength() >= 0 && vps->getVpsNonVuiExtLength() <= 4096 );
 
-#if P0307_VPS_NON_VUI_EXT_UPDATE
   Int nonVuiExtByte = uiCode;
   for (i = 1; i <= nonVuiExtByte; i++)
@@ -3157 +3156 @@
     READ_CODE( 8, uiCode, "vps_non_vui_extension_data_byte" ); //just parse and discard for now.
   }
-#else
-  if ( vps->getVpsNonVuiExtLength() > 0 )
-  {
-    printf("\n\nUp to the current spec, the value of vps_non_vui_extension_length is supposed to be 0\n");
-  }
-#endif
 
   READ_FLAG( uiCode, "vps_vui_present_flag"); vps->setVpsVuiPresentFlag(uiCode ? true : false);

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

@@ -2289 +2289 @@
 
   WRITE_UVLC( vps->getVpsNonVuiExtLength(), "vps_non_vui_extension_length" );
-#if P0307_VPS_NON_VUI_EXT_UPDATE
-  for (i = 1; i <= vps->getVpsNonVuiExtLength(); i++)
+
+  for( i = 1; i <= vps->getVpsNonVuiExtLength(); i++ )
   {
     WRITE_CODE(1, 8, "vps_non_vui_extension_data_byte");
   }
-#else
-  if ( vps->getVpsNonVuiExtLength() > 0 )
-  {
-    printf("\n\nUp to the current spec, the value of vps_non_vui_extension_length is supposed to be 0\n");
-  }
-#endif
 
   vps->setVpsVuiPresentFlag(true);