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

Timestamp:

27 Jan 2014, 17:25:26 (11 years ago)

Author:

seregin

Message:

remove M0457_PREDICTION_INDICATIONS macro

Location:

branches/SHM-5.0-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (2 diffs)
• TDecTop.h (modified) (3 diffs)

branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1428 +1428 @@
   }
 #endif
-#if VPS_EXTN_DIRECT_REF_LAYERS && M0457_PREDICTION_INDICATIONS
+#if VPS_EXTN_DIRECT_REF_LAYERS
   READ_UVLC( uiCode,           "direct_dep_type_len_minus2"); vps->setDirectDepTypeLen(uiCode+2);
 #if O0096_DEFAULT_DEPENDENCY_TYPE

branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -845 +845 @@
 #if SVC_EXTENSION
   m_apcSlicePilot->setSliceIdx( m_uiSliceIdx ); // it should be removed if HM will reflect it in above
-#if VPS_EXTN_DIRECT_REF_LAYERS && M0457_PREDICTION_INDICATIONS
+#if VPS_EXTN_DIRECT_REF_LAYERS
   setRefLayerParams(m_apcSlicePilot->getVPS());
 #endif
@@ -1963 +1963 @@
 #endif
 
-#if VPS_EXTN_DIRECT_REF_LAYERS && M0457_PREDICTION_INDICATIONS
+#if VPS_EXTN_DIRECT_REF_LAYERS
 
 Void TDecTop::setRefLayerParams( TComVPS* vps )

branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -117 +117 @@
   Int                     m_iBLSourceHeight;  
 #endif
-#if VPS_EXTN_DIRECT_REF_LAYERS && M0457_PREDICTION_INDICATIONS
+#if VPS_EXTN_DIRECT_REF_LAYERS
   Int                     m_numDirectRefLayers;
   Int                     m_refLayerId[MAX_VPS_LAYER_ID_PLUS1];
@@ -177 +177 @@
 #if VPS_EXTN_DIRECT_REF_LAYERS
   TDecTop*  getRefLayerDec(UInt refLayerIdc);
-#if M0457_PREDICTION_INDICATIONS
   Int       getNumDirectRefLayers           ()                              { return m_numDirectRefLayers;      }
   Void      setNumDirectRefLayers           (Int num)                       { m_numDirectRefLayers = num;       }
@@ -206 +205 @@
 
   Void      setRefLayerParams( TComVPS* vps );
-#endif
 #endif
 #if AVC_BASE