Changeset 608 in 3DVCSoftware for trunk/source/Lib/TLibCommon/NAL.h


Ignore:
Timestamp:
1 Sep 2013, 22:47:26 (11 years ago)
Author:
tech
Message:

Merged DEV-2.0-dev0@604.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/NAL.h

    r296 r608  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2012, ITU/ISO/IEC
     6 * Copyright (c) 2010-2013, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    4646{
    4747  NalUnitType m_nalUnitType; ///< nal_unit_type
    48   Bool        m_nalRefFlag;  ///< nal_ref_flag
    49 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    50   unsigned    m_layerId;
    51   unsigned    m_temporalId;  ///< temporal_id
     48  UInt        m_temporalId;  ///< temporal_id
     49#if H_MV
     50  Int         m_layerId;     ///< layer id
    5251#else
    53   Int         m_viewId;      ///< view_id
    54   Bool        m_isDepth;     ///< is_depth
    55   unsigned    m_temporalId;  ///< temporal_id
     52  UInt        m_reservedZero6Bits; ///< reserved_zero_6bits
    5653#endif
    5754
     
    5956  NALUnit(
    6057    NalUnitType nalUnitType,
    61     Bool        nalRefFlag,
    62 #if !VIDYO_VPS_INTEGRATION & !QC_MVHEVC_B0046   
    63     Int         viewId,
    64     Bool        isDepth,
     58    Int         temporalId = 0,
     59#if H_MV
     60    Int         layerId = 0)
    6561#else
    66     unsigned    layerId,
     62    Int         reservedZero6Bits = 0)
    6763#endif
    68     unsigned       temporalId = 0)
    6964    :m_nalUnitType (nalUnitType)
    70     ,m_nalRefFlag  (nalRefFlag)
    71 #if !VIDYO_VPS_INTEGRATION & !QC_MVHEVC_B0046
    72     ,m_viewId      (viewId)
    73     ,m_isDepth     (isDepth)
     65    ,m_temporalId  (temporalId)
     66#if H_MV
     67    ,m_layerId     (layerId)
    7468#else
    75     ,m_layerId     (layerId)
     69    ,m_reservedZero6Bits(reservedZero6Bits)
    7670#endif
    77     ,m_temporalId  (temporalId)
    7871  {}
    7972
     
    8275
    8376  /** returns true if the NALunit is a slice NALunit */
    84   bool isSlice()
     77  Bool isSlice()
    8578  {
    86     return m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR
    87 #if !QC_REM_IDV_B0046   
    88         || m_nalUnitType == NAL_UNIT_CODED_SLICE_IDV
    89 #endif
     79    return m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_R
     80        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_N
     81        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA_R
     82        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_N
     83        || m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_R
     84        || m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_N
     85        || m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP
     86        || m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_RADL
     87        || m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_N_LP
     88        || m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
     89        || m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP
    9090        || m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA
    91         || m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA
    92         || m_nalUnitType == NAL_UNIT_CODED_SLICE;
     91        || m_nalUnitType == NAL_UNIT_CODED_SLICE_RADL_N
     92        || m_nalUnitType == NAL_UNIT_CODED_SLICE_RADL_R
     93        || m_nalUnitType == NAL_UNIT_CODED_SLICE_RASL_N
     94        || m_nalUnitType == NAL_UNIT_CODED_SLICE_RASL_R;
     95  }
     96  Bool isSei()
     97  {
     98    return m_nalUnitType == NAL_UNIT_PREFIX_SEI
     99        || m_nalUnitType == NAL_UNIT_SUFFIX_SEI;
     100  }
     101
     102  Bool isVcl()
     103  {
     104    return ( (UInt)m_nalUnitType < 32 );
    93105  }
    94106};
Note: See TracChangeset for help on using the changeset viewer.