Changeset 324 in SHVCSoftware for branches/SHM-3.0-dev/source/Lib/TLibCommon

Timestamp:

3 Aug 2013, 12:30:39 (11 years ago)

Author:

seregin

Message:

remove alternative collocated picture signalling (JCTVC-N0107)

Location:

branches/SHM-3.0-dev/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/SHM-3.0-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3376 +3376 @@
 
   // use coldir.
-#if M0457_COL_PICTURE_SIGNALING
+#if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
   TComPic *pColPic;
   if (m_layerId > 0 && getSlice()->getAltColIndicationFlag())

branches/SHM-3.0-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -124 +124 @@
   m_numILRRefIdx = 0;
 #endif 
-#if M0457_COL_PICTURE_SIGNALING
+#if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
   m_altColIndicationFlag = false;
   m_colRefLayerIdx       = 0;

branches/SHM-3.0-dev/source/Lib/TLibCommon/TComSlice.h

@@ -1778 +1778 @@
   Void      setMFMEnabledFlag(Bool flag)                { m_bMFMEnabledFlag = flag; }
   Bool      getMFMEnabledFlag()                         { return m_bMFMEnabledFlag; }
+#if !REMOVE_COL_PICTURE_SIGNALING
   Void      setColRefLayerIdx(Int i)                    { m_colRefLayerIdx = i;     }
   Int       getColRefLayerIdx()                         { return m_colRefLayerIdx;  }
@@ -1784 +1785 @@
   Void      setMotionPredIlp(TComPic *ilpPic)           { m_pcIlpPic = ilpPic; }
   TComPic*  getMotionPredIlp()                          { return m_pcIlpPic; }
+#endif
 #endif
 #endif

branches/SHM-3.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -103 +103 @@
 #endif
 #if REF_IDX_MFM
+#define REMOVE_COL_PICTURE_SIGNALING     1     ///< JCTVC-N0107 remove alternative collocated picture signalling
 #define M0457_COL_PICTURE_SIGNALING      1
 #endif