Changeset 291 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibCommon

Timestamp:

18 Jun 2013, 14:06:13 (12 years ago)

Author:

nokia

Message:

JCTVC-M0457: Co-located picture signaling

Location:

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

Files:

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

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

@@ -3583 +3583 @@
 
   // use coldir.
+#if M0457_COL_PICTURE_SIGNALING
+  TComPic *pColPic;
+  if (m_layerId > 0 && getSlice()->getAltColIndicationFlag())
+  {
+    pColPic = getSlice()->getMotionPredIlp();
+  }
+  else
+  {
+    pColPic = getSlice()->getRefPic( RefPicList(getSlice()->isInterB() ? 1-getSlice()->getColFromL0Flag() : 0), getSlice()->getColRefIdx());
+  }
+#else
   TComPic *pColPic = getSlice()->getRefPic( RefPicList(getSlice()->isInterB() ? 1-getSlice()->getColFromL0Flag() : 0), getSlice()->getColRefIdx());
+#endif
   TComDataCU *pColCU = pColPic->getCU( uiCUAddr );
   if(pColCU->getPic()==0||pColCU->getPartitionSize(uiPartUnitIdx)==SIZE_NONE)

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

@@ -135 +135 @@
   m_numILRRefIdx = 0;
 #endif 
+#if M0457_COL_PICTURE_SIGNALING
+  m_altColIndicationFlag = false;
+  m_colRefLayerIdx       = 0;
+#endif
 #endif
 #endif
@@ -545 +549 @@
 #endif
     {
+#if M0457_COL_PICTURE_SIGNALING
+      if(!(m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_eNalUnitType <= NAL_UNIT_CODED_SLICE_CRA) && getMFMEnabledFlag())
+#else
       if(!(m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_eNalUnitType <= NAL_UNIT_CODED_SLICE_CRA) && m_pcSPS->getMFMEnabledFlag())
+#endif
       { 
         ilpPic[refLayerIdc]->copyUpsampledMvField( refLayerIdc, m_pcBaseColPic[refLayerIdc] );

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

@@ -1038 +1038 @@
 #endif
 #if REF_IDX_MFM
+#if !M0457_COL_PICTURE_SIGNALING
   Bool m_bMFMEnabledFlag;
+#endif
 #endif
 #if SCALED_REF_LAYER_OFFSETS
@@ -1180 +1182 @@
 #endif
 #if REF_IDX_MFM
+#if !M0457_COL_PICTURE_SIGNALING
   Void     setMFMEnabledFlag(Bool flag) {m_bMFMEnabledFlag = flag;}
   Bool     getMFMEnabledFlag()          {return m_bMFMEnabledFlag;}
+#endif
 #endif
 #if SCALED_REF_LAYER_OFFSETS
@@ -1515 +1519 @@
   TComPic*    m_pcBaseColPic[MAX_LAYERS];
   TComPicYuv* m_pcFullPelBaseRec[MAX_LAYERS];
+#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
+  Int         m_numMotionPredRefLayers;
+#if REF_IDX_MFM
+  Bool        m_bMFMEnabledFlag;
+  Int         m_colRefLayerIdx;
+  Bool        m_altColIndicationFlag;
+  TComPic*    m_pcIlpPic;
+#endif
+#endif
 #endif 
   Bool        m_bTLayerSwitchingFlag;
@@ -1834 +1847 @@
   Void      setNumILRRefIdx     ( Int i )               { m_numILRRefIdx = i;     }
 #endif 
+
+#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
+  Void      setNumMotionPredRefLayers(int i)            { m_numMotionPredRefLayers = i; }
+  Int       getNumMotionPredRefLayers()                 { return m_numMotionPredRefLayers; }
+#if REF_IDX_MFM
+  Void      setMFMEnabledFlag(Bool flag)                { m_bMFMEnabledFlag = flag; }
+  Bool      getMFMEnabledFlag()                         { return m_bMFMEnabledFlag; }
+  Void      setColRefLayerIdx(Int i)                    { m_colRefLayerIdx = i;     }
+  Int       getColRefLayerIdx()                         { return m_colRefLayerIdx;  }
+  Void      setAltColIndicationFlag(Bool i)             { m_altColIndicationFlag = i; }
+  Bool      getAltColIndicationFlag()                   { return m_altColIndicationFlag; }
+  Void      setMotionPredIlp(TComPic *ilpPic)           { m_pcIlpPic = ilpPic; }
+  TComPic*  getMotionPredIlp()                          { return m_pcIlpPic; }
+#endif
+#endif
+
 #endif
 

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

@@ -101 +101 @@
 #define ILR_RESTR                        1     ///< JCTVC-M0209 Inter-layer RPS and RPL
 #endif
+#define M0457_COL_PICTURE_SIGNALING      1
 
 #else