Changeset 194 in 3DVCSoftware for branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/NAL.h

Timestamp:

26 Nov 2012, 18:35:20 (12 years ago)

Author:

qualcomm

Message:

JCT3V-B0046, MVHEVC codec;
Two bugs fixed for HTM:
1) encoder crash, see the macro 'BUG_FIX_HTM'
2) wrong place for '#endif' in TComPrediction.h

File:

• branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/NAL.h (modified) (4 diffs)

branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/NAL.h

@@ -51 +51 @@
   NalRefIdc   m_nalRefIDC;   ///< nal_ref_idc
 #endif
-#if VIDYO_VPS_INTEGRATION
+#if VIDYO_VPS_INTEGRATION|MVHEVC
   unsigned    m_layerId;
   unsigned    m_temporalId;  ///< temporal_id
@@ -69 +69 @@
     NalUnitType nalUnitType,
     Bool        nalRefFlag,
-#if !VIDYO_VPS_INTEGRATION    
+#if !VIDYO_VPS_INTEGRATION & !MVHEVC    
     Int         viewId,
     Bool        isDepth,
@@ -78 +78 @@
     :m_nalUnitType (nalUnitType)
     ,m_nalRefFlag  (nalRefFlag)
-#if !VIDYO_VPS_INTEGRATION
+#if !VIDYO_VPS_INTEGRATION & !MVHEVC
     ,m_viewId      (viewId)
     ,m_isDepth     (isDepth)
@@ -139 +139 @@
     return m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR
 #if H0566_TLA
+#if !QC_REM_IDV    
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_IDV
+#endif
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA