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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: NON_REF_NAL_TYPE_DISCARDABLE

File:

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

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++;
     }