Changeset 462 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib

Timestamp:

12 Nov 2013, 19:19:27 (11 years ago)

Author:

seregin

Message:

use layerIdc for accessing the reference layer picture for MFM constraint

Location:

branches/SHM-4.0-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

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

@@ -3050 +3050 @@
 }
 
+#if MFM_ENCCONSTRAINT
+TComPic* TComSlice::getBaseColPic(  TComList<TComPic*>& rcListPic )
+{
+#if POC_RESET_FLAG
+  return xGetRefPic( rcListPic, m_bPocResetFlag ? 0 : m_iPOC );
+#else
+  return xGetRefPic( rcListPic, m_iPOC );
+#endif
+}
+#endif
+
 #if REF_IDX_MFM
 Void TComSlice::setRefPOCListILP( TComPic** ilpPic, TComPic** pcRefPicRL )

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

@@ -1977 +1977 @@
   TComPic*  getBaseColPic       (UInt refLayerIdc)                { return m_pcBaseColPic[refLayerIdc]; }
   TComPic** getBaseColPic       ()                { return &m_pcBaseColPic[0]; }
+#if MFM_ENCCONSTRAINT
+  TComPic*  getBaseColPic( TComList<TComPic*>& rcListPic );
+#endif
 
   Void      setLayerId (UInt layerId)   { m_layerId = layerId; }

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

@@ -1226 +1226 @@
       Int refLayerId = pcSlice->getRefPic( pcSlice->getSliceType() == B_SLICE ? ( RefPicList )( 1 - pcSlice->getColFromL0Flag() ) : REF_PIC_LIST_0 , pcSlice->getColRefIdx() )->getLayerId();
       if( refLayerId != pcSlice->getLayerId() )
-      {        
-        TComPic * pColBasePic = pcSlice->getBaseColPic( refLayerId );
+      {
+        TComPic* pColBasePic = pcSlice->getBaseColPic( *m_ppcTDecTop[refLayerId]->getListPic() );
         assert( pColBasePic->checkSameRefInfo() == true );
       }

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1182 +1182 @@
         UInt ColFromL0Flag = pcSlice->getColFromL0Flag();
         UInt ColRefIdx     = pcSlice->getColRefIdx();
+
         for(Int colIdx = 0; colIdx < pcSlice->getNumRefIdx( RefPicList(1 - ColFromL0Flag) ); colIdx++) 
         { 
           if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->isILR(m_layerId) 
 #if MFM_ENCCONSTRAINT
-            && pcSlice->getBaseColPic( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getLayerId() )->checkSameRefInfo() == true 
+            && pcSlice->getBaseColPic( *m_ppcTEncTop[pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getLayerId()]->getListPic() )->checkSameRefInfo() == true 
 #endif
             ) 
@@ -1203 +1204 @@
             if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->isILR(m_layerId) 
 #if MFM_ENCCONSTRAINT
-              && pcSlice->getBaseColPic( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getLayerId() )->checkSameRefInfo() == true 
+              && pcSlice->getBaseColPic( *m_ppcTEncTop[pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getLayerId()]->getListPic() )->checkSameRefInfo() == true 
 #endif
               )