Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/NALread.cpp


Ignore:
Timestamp:
20 Feb 2013, 22:07:43 (11 years ago)
Author:
tech
Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/NALread.cpp

    r210 r296  
    124124  assert(forbidden_zero_bit == 0);
    125125
    126 #if NAL_REF_FLAG
    127126  nalu.m_nalRefFlag  = (bs.read(1) != 0 );
    128127  nalu.m_nalUnitType = (NalUnitType) bs.read(6);
    129 #else
    130   nalu.m_nalRefIDC   = (NalRefIdc) bs.read(2);
    131   nalu.m_nalUnitType = (NalUnitType) bs.read(5);
    132 #endif
    133128
    134129#if QC_MVHEVC_B0046
     
    137132  nalu.m_temporalId = bs.read(3) - 1;
    138133#else
    139 #if H0388
    140134  nalu.m_temporalId = bs.read(3);
    141135 //  unsigned reserved_one_5bits = bs.read(5);
     
    147141  nalu.m_isDepth  = bs.read(1);
    148142#endif
    149 #if H0566_TLA
    150143  if ( nalu.m_temporalId )
    151144  {
     
    157150  }
    158151#endif
    159 #else
    160   switch (nalu.m_nalUnitType)
    161   {
    162   case NAL_UNIT_CODED_SLICE:
    163   case NAL_UNIT_CODED_SLICE_IDR:
    164 #if H0566_TLA
    165 #if !QC_REM_IDV_B0046
    166   case NAL_UNIT_CODED_SLICE_IDV:
    167 #endif
    168   case NAL_UNIT_CODED_SLICE_CRA:
    169   case NAL_UNIT_CODED_SLICE_TLA:
    170 #else
    171   case NAL_UNIT_CODED_SLICE_CDR:
    172 #endif
    173     {
    174       nalu.m_temporalId = bs.read(3);
    175 #if VIDYO_VPS_INTEGRATION
    176       nalu.m_layerId    = bs.read(5) - 1;
    177 #else
    178       nalu.m_OutputFlag = bs.read(1);
    179   //    unsigned reserved_one_4bits = bs.read(4);
    180   //    assert(reserved_one_4bits == 1);
    181       nalu.m_viewId   = bs.read(3)-1;
    182       nalu.m_isDepth  = bs.read(1);
    183 #endif
    184 
    185 #if H0566_TLA
    186       if (nalu.m_temporalId == 0)
    187       {
    188 #if QC_REM_IDV_B0046
    189         assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR);
    190 #else
    191         assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDV );
    192 #endif
    193       }
    194       else
    195       {
    196         assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA);
    197       }
    198 #endif
    199     }
    200     break;
    201   default:
    202     nalu.m_temporalId = 0;
    203     nalu.m_OutputFlag = true;
    204     break;
    205   }
    206 #endif
    207 #endif
    208152}
    209153//! \}
Note: See TracChangeset for help on using the changeset viewer.