Changeset 1204 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

8 Jul 2015, 21:01:37 (10 years ago)

Author:

seregin

Message:

macro cleanup: POC_RESET_RESTRICTIONS

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -2313 +2313 @@
   Bool     isRASL()   { return (m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL_N || m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL_R); }
 
-#if POC_RESET_RESTRICTIONS
   Bool     isIDR()    { return (m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
                                   || m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP); }
@@ -2328 +2327 @@
                                   || m_eNalUnitType == NAL_UNIT_RESERVED_VCL_N12
                                   || m_eNalUnitType == NAL_UNIT_RESERVED_VCL_N14 ); }
-#endif
+
   Bool      getDiscardableFlag  ()                           { return m_bDiscardableFlag;    }
   Void      setDiscardableFlag  (Bool b)                     { m_bDiscardableFlag = b;       }

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

@@ -46 +46 @@
 #define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
-#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
 #define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag