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

Timestamp:

5 Jun 2013, 03:48:35 (12 years ago)

Author:

seregin

Message:

reference layers setting and related

Location:

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

Files:

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

branches/SHM-2.1-multilayers-dev/source/Lib/TLibCommon/TComPic.cpp

@@ -568 +568 @@
 
 #if REF_IDX_MFM
-Void TComPic::copyUpsampledMvField(TComPic* pcPicBase)
-{
-  UInt refLayerIdc = pcPicBase->getLayerId();
+Void TComPic::copyUpsampledMvField(UInt refLayerIdc, TComPic* pcPicBase)
+{
 #if AVC_SYNTAX && !ILP_DECODED_PICTURE
   const Window &confBL = pcPicBase->getConformanceWindow();

branches/SHM-2.1-multilayers-dev/source/Lib/TLibCommon/TComPic.h

@@ -124 +124 @@
 
 #if REF_IDX_MFM
-  Void          copyUpsampledMvField  (  TComPic* pcPicBase );
+  Void          copyUpsampledMvField  ( UInt refLayerIdc, TComPic* pcPicBase );
   Void          initUpsampledMvField  ();
 #endif

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

@@ -544 +544 @@
       if(!(m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_eNalUnitType <= NAL_UNIT_CODED_SLICE_CRA) && m_pcSPS->getMFMEnabledFlag())
       { 
-        ilpPic[refLayerIdc]->copyUpsampledMvField( m_pcBaseColPic[refLayerIdc] );
+        ilpPic[refLayerIdc]->copyUpsampledMvField( refLayerIdc, m_pcBaseColPic[refLayerIdc] );
       }
       else
@@ -1094 +1094 @@
   m_activeNumILRRefIdx         = pSrc->m_activeNumILRRefIdx;
   m_interLayerPredEnabledFlag  = pSrc->m_interLayerPredEnabledFlag;
-  m_numInterLayerRefPics       = pSrc->m_numInterLayerRefPics;
   memcpy( m_interLayerPredLayerIdc, pSrc->m_interLayerPredLayerIdc, sizeof( m_interLayerPredLayerIdc ) );
 #elif REF_IDX_FRAMEWORK

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

@@ -1532 +1532 @@
 #if JCTVC_M0458_INTERLAYER_RPS_SIG
   Bool       m_interLayerPredEnabledFlag;
-  Int        m_numInterLayerRefPics;
 #endif 
 public:
@@ -1803 +1802 @@
   Void      setActiveNumILRRefIdx     ( Int i )         { m_activeNumILRRefIdx = i;     }  
 
-  Int       getInterLayerPredLayerIdc (UInt Idx )               { return  m_interLayerPredLayerIdc[Idx];}
-  Void      setInterLayerPredLayerIdc (UInt val, UInt Idx)      { m_interLayerPredLayerIdc[Idx] = val;  }
+  Int       getInterLayerPredLayerIdc (UInt layerIdx)                        { return  m_interLayerPredLayerIdc[layerIdx];}
+  Void      setInterLayerPredLayerIdc (UInt refLayerIdc, UInt layerIdx)      { m_interLayerPredLayerIdc[layerIdx] = refLayerIdc;  }
 
   Void      setInterLayerPredEnabledFlag     ( Bool   val )    { m_interLayerPredEnabledFlag = val; }
-  Bool      getInterLayerPredEnabledFlag     ()                { return m_interLayerPredEnabledFlag;}
-
-  Void      setNumInterLayerRefPics          ( UInt   val )    { m_numInterLayerRefPics = val; }
-  UInt      getNumInterLayerRefPics          ()                { return m_numInterLayerRefPics;}  
+  Bool      getInterLayerPredEnabledFlag     ()                { return m_interLayerPredEnabledFlag;} 
 #else
   Void      setNumILRRefIdx     ( Int i )               { m_numILRRefIdx = i;     }