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

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/TLibEncoder

Files:

• TEncGOP.cpp (modified) (1 diff)
• TEncTop.h (modified) (2 diffs)

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; }