Changeset 312 in SHVCSoftware

Timestamp:

24 Jul 2013, 15:38:49 (11 years ago)

Author:

seregin

Message:

fix REF_IDX_MFM off case

Location:

trunk/source/Lib/TLibCommon

Files:

• CommonDef.h (modified) (1 diff)
• TComSlice.cpp (modified) (3 diffs)
• TypeDef.h (modified) (1 diff)

trunk/source/Lib/TLibCommon/CommonDef.h

@@ -57 +57 @@
 
 #if SVC_EXTENSION
-#define NV_VERSION        "2.1"                 ///< Current software version
+#define NV_VERSION        "trunk"                 ///< Current software version
 #else
 #define NV_VERSION        "11.0"                ///< Current software version

trunk/source/Lib/TLibCommon/TComSlice.cpp

@@ -455 +455 @@
     UInt refLayerIdc = m_interLayerPredLayerIdc[i];
     //inter-layer reference picture
-#if REF_IDX_MFM
 
 #if ILR_RESTR
@@ -464 +463 @@
     if( m_layerId > 0 && ( ( (Int)(ilpPic[refLayerIdc]->getSlice(0)->getTLayer())<=maxSubLayerForILPPlus1-1) || (maxSubLayerForILPPlus1==0 && ilpPic[refLayerIdc]->getSlice(0)->getRapPicFlag()) )  )
 #endif
-
-#else
+#else //#if ILR_RESTR
 #if ZERO_NUM_DIRECT_LAYERS
     if( m_layerId > 0 && m_activeNumILRRefIdx > 0 )
@@ -471 +469 @@
     if( m_layerId > 0 )
 #endif
-#endif
-    {
+#endif //#if ILR_RESTR
+    {
+#if REF_IDX_MFM
 #if M0457_COL_PICTURE_SIGNALING
       if(!(m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_eNalUnitType <= NAL_UNIT_CODED_SLICE_CRA) && getMFMEnabledFlag())

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -104 +104 @@
 #define ILR_RESTR                        1     ///< JCTVC-M0209 Inter-layer RPS and RPL
 #endif
+#if REF_IDX_MFM
 #define M0457_COL_PICTURE_SIGNALING      1
+#endif
 
 #if !VPS_EXTN_DIRECT_REF_LAYERS || !M0457_PREDICTION_INDICATIONS || !JCTVC_M0458_INTERLAYER_RPS_SIG