Changeset 464 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2a/source/App

Timestamp:

11 Jun 2013, 20:35:00 (12 years ago)

Author:

zhang

Message:

Implementation of ARP from QC

Location:

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

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• TAppDecoder/TAppDecTop.h (modified) (1 diff)
• TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)

branches/HTM-DEV-0.3-dev2a/source/App/TAppDecoder/TAppDecTop.cpp

@@ -647 +647 @@
 #if H_3D
    m_tDecTop[ decIdx ]->setCamParsCollector( &m_cCamParsCollector );
+#if H_3D_ARP
+    m_tDecTop[ decIdx ]->setTAppDecTop(this);
+#endif
 #endif
 

branches/HTM-DEV-0.3-dev2a/source/App/TAppDecoder/TAppDecTop.h

@@ -91 +91 @@
   Void  decode            (); ///< main decoding function
  
+#if H_3D_ARP
+  TDecTop* getTDecTop     ( Int layerId )          { return m_tDecTop[layerId]; }
+#endif
+
 protected:
   Void  xCreateDecLib     (); ///< create internal classes

branches/HTM-DEV-0.3-dev2a/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -503 +503 @@
 #if L0386_DB_METRIC
   ("DeblockingFilterMetric",         m_DeblockingFilterMetric,         false )
+#endif
+
+#if H_3D_ARP
+  ("AdvMultiviewResPred",      m_uiUseAdvResPred,           (UInt)1, "Usage of Advanced Residual Prediction" )
 #endif
 
@@ -1387 +1391 @@
   xConfirmPara(  m_maxNumMergeCand < 1,  "MaxNumMergeCand must be 1 or greater.");
   xConfirmPara(  m_maxNumMergeCand > 5,  "MaxNumMergeCand must be 5 or smaller.");
+
+#if H_3D_ARP
+  xConfirmPara( ( 0 != m_uiUseAdvResPred ) &&  ( 1 != m_uiUseAdvResPred ), "UseAdvResPred must be 0 or 1." );
+#endif
 
 #if ADAPTIVE_QP_SELECTION
@@ -2278 +2286 @@
   printf("WVSO:%d ", m_bUseWVSO );  
 #endif
+#if H_3D_ARP
+  printf(" ARP:%d  ", m_uiUseAdvResPred  );
+#endif
   printf("\n\n");  
 

branches/HTM-DEV-0.3-dev2a/source/App/TAppEncoder/TAppEncCfg.h

@@ -238 +238 @@
   Bool      m_bUseFastEnc;                                    ///< flag for using fast encoder setting
   Bool      m_bUseEarlyCU;                                    ///< flag for using Early CU setting
+
+#if H_3D_ARP
+  UInt      m_uiUseAdvResPred;
+  UInt      m_uiARPStepNum;
+#endif
+
   Bool      m_useFastDecisionForMerge;                        ///< flag for using Fast Decision Merge RD-Cost 
   Bool      m_bUseCbfFastMode;                              ///< flag for using Cbf Fast PU Mode Decision

branches/HTM-DEV-0.3-dev2a/source/App/TAppEncoder/TAppEncTop.cpp

@@ -122 +122 @@
   vps.initViewIndex(); 
   m_ivPicLists.setVPS      ( &vps ); 
+#if H_3D_ARP
+  for(Int i = 0; i < m_numberOfLayers; i++)
+  {
+    Bool isDepth = vps.getDepthId( i );
+    vps.setUseAdvRP        ( i, ( isDepth || 0==i ) ? 0 : m_uiUseAdvResPred );
+    vps.setARPStepNum      ( i, ( isDepth || 0==i ) ? 1 : H_3D_ARP_WFNR     );
+  }
+#endif
 #endif
 
@@ -166 +174 @@
     m_cTEncTop.setDWeight                      ( isDepth ? m_iDWeight             : 0     );
 #endif // H_3D_VSO
+#if H_3D_ARP
+    //====== Advanced Inter-view Residual Prediction =========
+    m_cTEncTop.setUseAdvRP                     ( ( isDepth || 0==layer ) ? 0 : m_uiUseAdvResPred );
+    m_cTEncTop.setARPStepNum                   ( ( isDepth || 0==layer ) ? 1 : H_3D_ARP_WFNR     );
+#endif
 #endif // H_3D
 
@@ -605 +618 @@
   {
     m_acTEncTopList[layer]->init( );
+#if H_3D_ARP
+    m_acTEncTopList[layer]->setTAppEncTop( this );
+#endif
   }
 #else