Changeset 1102 in SHVCSoftware

Timestamp:

6 Jul 2015, 20:25:34 (9 years ago)

Author:

seregin

Message:

macro cleanup: POC_MSB_VAL_PRESENT_FLAG_SEM

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

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

@@ -138 +138 @@
 #define UNAVAILABLE_PIC_BUGFIX           1
 #endif
-#if INFERENCE_POC_MSB_VAL_PRESENT
-#define POC_MSB_VAL_PRESENT_FLAG_SEM     0      ///< JCTVC-Q0146: Inference of poc_msb_val_present_flag
-#else
-#define POC_MSB_VAL_PRESENT_FLAG_SEM     1      ///< JCTVC-Q0146: Inference of poc_msb_val_present_flag
-#endif
 #define POC_RESET_INFO_INFERENCE         1      ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present
 #define NO_OUTPUT_OF_PRIOR_PICS          1      ///< Use no_output_of_prior_pics_flag

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

@@ -2051 +2051 @@
     else
     {
-#if POC_MSB_VAL_PRESENT_FLAG_SEM
-      if( sliceHeaderExtensionLength == 0 )
-      {
-        pcSlice->setPocMsbValPresentFlag( false );
-      }
-      else if( pcSlice->getPocMsbValRequiredFlag() )
-#else
       if( pcSlice->getPocMsbValRequiredFlag() )
-#endif
       {
         pcSlice->setPocMsbValPresentFlag( true );