Changeset 1183 in SHVCSoftware

Timestamp:

8 Jul 2015, 03:11:41 (9 years ago)

Author:

seregin

Message:

macro cleanup: NON_REF_NAL_TYPE_DISCARDABLE

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -47 +47 @@
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
 #define INFERENCE_POC_MSB_VAL_PRESENT    1      ///< JCTVC-Q0146 -- poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0
-#define NON_REF_NAL_TYPE_DISCARDABLE     1      ///< JCTVC-P0041 -- If discardable picture is a non-IRAP, it must be a non-referenced sub-layer picture
 #define POC_RESET_RESTRICTIONS           1      ///< Restrictions on semantics of POC reset-related syntax elements, including one item from R0223
 #define POC_RESET_VALUE_RESTRICTION      1      ///< R0223: Restriction on the value of full_poc_reset_flag

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

@@ -1225 +1225 @@
     if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
     {
-      READ_FLAG(uiCode, "discardable_flag"); // ignored
-#if NON_REF_NAL_TYPE_DISCARDABLE
+      READ_FLAG(uiCode, "discardable_flag");
       pcSlice->setDiscardableFlag( uiCode ? true : false );
-      if (uiCode)
+
+      if( uiCode )
       {
         assert(pcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_TRAIL_R &&
@@ -1236 +1236 @@
           pcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_RASL_R);
       }
-#endif
+
       iBits++;
     }

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

@@ -938 +938 @@
     {
       assert(!!"discardable_flag");
-#if NON_REF_NAL_TYPE_DISCARDABLE
+
       if (pcSlice->getDiscardableFlag())
       {
@@ -947 +947 @@
           pcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_RASL_R);
       }
-#endif
+
       WRITE_FLAG(pcSlice->getDiscardableFlag(), "discardable_flag");
       iBits++;