Changeset 489 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2a/source/Lib

Timestamp:

22 Jun 2013, 22:37:06 (12 years ago)

Author:

zhang

Message:

Use m_ivPicLists instead of TAppE/DencTop encapsulated with H_3D_ARP_FIX

Location:

branches/HTM-DEV-0.3-dev2a/source/Lib

Files:

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

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TComPic.cpp

@@ -556 +556 @@
   return getPicYuv( layerIdInNuh, poc, recon );
 }
+#if H_3D_ARP_FIX
+TComList<TComPic*>* TComPicLists::getPicList( Int layerIdInNuh )
+{
+  TComList<TComList<TComPic*>*>::iterator itL = m_lists.begin();
+  Int iLayer = 0;
+
+  assert( layerIdInNuh < m_lists.size() );
+
+  while( iLayer != layerIdInNuh )
+  {
+    itL++;
+    iLayer++;
+  }
+
+  return *itL;
+}
+#endif
 #endif // H_3D
 #endif // H_MV

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TComPic.h

@@ -234 +234 @@
   Void        push_back( TComList<TComPic*>* list ) { m_lists.push_back( list );   }
   Int         size     ()                           { return (Int) m_lists.size(); } 
+#if H_3D_ARP_FIX
+  TComList<TComPic*>*  getPicList   ( Int layerIdInNuh );
+#endif
   TComPic*    getPic   ( Int layerIdInNuh,              Int poc );    
   TComPicYuv* getPicYuv( Int layerIdInNuh,              Int poc, Bool recon ); 

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TypeDef.h

@@ -125 +125 @@
 #if H_3D_ARP
 #define H_3D_ARP_WFNR                     3
+#define H_3D_ARP_FIX                      1   // Fix of using m_ivPicLists to access the reference pictures of other views
 #endif
 

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibDecoder/TDecTop.cpp

@@ -901 +901 @@
         if( iViewIdx<getViewIndex() && !bIsDepth )
         {
+#if H_3D_ARP_FIX
+          pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx );
+#else
           //GT (IVREFS): m_tAppDecTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 
           pcSlice->setBaseViewRefPicList( m_tAppDecTop->getTDecTop(iLayerId)->getListPic(), iViewIdx );
+#endif
         }
       }

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibDecoder/TDecTop.h

@@ -227 +227 @@
 #endif
 
-#if H_3D_ARP 
+#if H_3D_ARP && !H_3D_ARP_FIX
   //GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later. 
   TAppDecTop*             m_tAppDecTop;
@@ -273 +273 @@
   Void                    setCamParsCollector( CamParsCollector* pcCamParsCollector ) { m_pcCamParsCollector = pcCamParsCollector; }
 
-#if H_3D_ARP
+#if H_3D_ARP && !H_3D_ARP_FIX
   //GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later. 
   Void                    setTAppDecTop( TAppDecTop* pcTAppDecTop ) { m_tAppDecTop = pcTAppDecTop; }

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -683 +683 @@
         if( iViewIdx<getViewIndex() && !bIsDepth )
         {
+#if H_3D_ARP_FIX
+          pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx );
+#else
           //GT (IVREFS): m_tAppEncTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 
           pcSlice->setBaseViewRefPicList( m_pcEncTop->getTAppEncTop()->getTEncTop( iLayerId )->getListPic(), iViewIdx );
+#endif
         }
       }

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncTop.h

@@ -129 +129 @@
   TEncRateCtrl            m_cRateCtrl;                    ///< Rate control class
 
-#if H_3D_ARP
+#if H_3D_ARP && !H_3D_ARP_FIX
   TAppEncTop*             m_pcTAppEncTop;
 #endif
@@ -213 +213 @@
   Void                    setIvPicLists         ( TComPicLists* picLists) { m_ivPicLists = picLists; }
 #endif
-#if H_3D_ARP
+#if H_3D_ARP && !H_3D_ARP_FIX
   //GT (IVREFS): m_tAppDecTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 
   Void            setTAppEncTop( TAppEncTop* pcTAppEncTop ) { m_pcTAppEncTop = pcTAppEncTop; }