Changeset 1112 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

6 Jul 2015, 21:19:10 (9 years ago)

Author:

seregin

Message:

macro cleanup: 0146_SSH_EXT_DATA_BIT

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -79 +79 @@
 #define Q0177_EOS_CHECKS                 1      ///< JCTVC-Q0177; Put checks on handling EOS
 #define Q0142_POC_LSB_NOT_PRESENT        1      ///< JCTVC-Q0142; Add constraint checking on the value of poc_reset_idc and poc_lsb_val
-#define Q0146_SSH_EXT_DATA_BIT           1      ///< JCTVC-Q0146; Bug-fix -- the SSH_EXT_DATA_BIT can have any value -- not required to be 1
 
 #define P0130_EOB                        1      ///< JCTVC-P0130, set layer Id of EOB NALU to be fixed to 0

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

@@ -2081 +2081 @@
     while( counter )
     {
-#if Q0146_SSH_EXT_DATA_BIT 
       READ_FLAG( uiCode, "slice_segment_header_extension_data_bit" );
-#else
-      READ_FLAG( uiCode, "slice_segment_header_extension_reserved_bit" ); assert( uiCode == 1 );
-#endif
       counter--;
     }

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

@@ -1982 +1982 @@
     for (Int i = 0; i < shExtnAdditionalBits; i++)
     {
-#if Q0146_SSH_EXT_DATA_BIT 
       WRITE_FLAG( 1, "slice_segment_header_extension_data_bit");
-#else
-      WRITE_FLAG( 1, "slice_segment_header_extension_reserved_bit");
-#endif
     }
   }