Changeset 969 in 3DVCSoftware for branches/HTM-11.1-dev0/source/App

Timestamp:

5 Jul 2014, 09:34:43 (11 years ago)

Author:

tech

Message:

Cleanup part 3.

Location:

branches/HTM-11.1-dev0/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (6 diffs)

branches/HTM-11.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -523 +523 @@
 #if H_3D_IC
   ("IlluCompEnable",           m_abUseIC, true, "Enable illumination compensation")
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086
   ("IlluCompLowLatencyEnc",    m_bUseLowLatencyICEnc, false, "Enable low-latency illumination compensation encoding")
-#endif
 #endif
 #if H_3D_INTER_SDC
@@ -2515 +2513 @@
 #if H_3D_IC
   printf( "IlluCompEnable:%d ", m_abUseIC);
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086
   printf ("IlluCompLowLatencyEnc:%d ",  m_bUseLowLatencyICEnc);
-#endif
 #endif
 #if H_3D_NBDV_REF

branches/HTM-11.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

@@ -140 +140 @@
 #if H_3D_IC
   Bool   m_abUseIC;
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086
-  Bool  m_bUseLowLatencyICEnc;
-#endif
+  Bool   m_bUseLowLatencyICEnc;
 #endif
 #if H_3D_NBDV_REF

branches/HTM-11.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -193 +193 @@
     m_cTEncTop.setDWeight                      ( isDepth ? m_iDWeight             : 0     );
 #endif // H_3D_VSO
-#if H_3D_ARP && !QC_IV_PRED_CONSTRAINT_H0137
-    //====== Advanced Inter-view Residual Prediction =========
-    m_cTEncTop.setUseAdvRP                     ( ( isDepth || 0==layerIdInVps ) ? 0 : m_uiUseAdvResPred );
-    m_cTEncTop.setARPStepNum                   ( ( isDepth || 0==layerIdInVps ) ? 1 : H_3D_ARP_WFNR     );
-#endif
 #if H_3D_SPIVMP
     m_cTEncTop.setSubPULog2Size                 (( isDepth || 0==layerIdInVps ) ? 0 : m_iSubPULog2Size   );
@@ -204 +199 @@
 #if H_3D_IC
     m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_abUseIC );
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086
     m_cTEncTop.setUseICLowLatencyEnc           ( m_bUseLowLatencyICEnc );
-#endif
 #endif
   //========== Depth intra modes ==========
@@ -1869 +1862 @@
 
 #if H_3D_ARP
-#if QC_IV_PRED_CONSTRAINT_H0137
     vps.setUseAdvRP        ( layer, ( isDepth || isLayerZero || !vps.getNumDirectRefLayers(layer) ) ? 0 : m_uiUseAdvResPred );
     vps.setARPStepNum      ( layer, ( isDepth || isLayerZero || !vps.getNumDirectRefLayers(layer) ) ? 1 : H_3D_ARP_WFNR     );
-#else
-    vps.setUseAdvRP        ( layer, ( isDepth || isLayerZero ) ? 0 : m_uiUseAdvResPred );
-    vps.setARPStepNum      ( layer, ( isDepth || isLayerZero ) ? 1 : H_3D_ARP_WFNR     );
-#endif  
 #endif  
 #if H_3D_SPIVMP
@@ -1893 +1881 @@
 
 #if H_3D_IV_MERGE
-#if QC_IV_PRED_CONSTRAINT_H0137
     if( !vps.getNumDirectRefLayers(layer) )
     {
@@ -1900 +1887 @@
     else
     {
-#endif
-    if( isDepth )
-    {
-      vps.setIvMvPredFlag         ( layer, (layer != 1) && m_ivMvPredFlag[1] ); 
-    }
-    else
-    {
-      vps.setIvMvPredFlag         ( layer, !isLayerZero && m_ivMvPredFlag[0] ); 
-    }
-#if QC_IV_PRED_CONSTRAINT_H0137
-    }
-#endif
+      if( isDepth )
+      {
+        vps.setIvMvPredFlag         ( layer, (layer != 1) && m_ivMvPredFlag[1] ); 
+      }
+      else
+      {
+        vps.setIvMvPredFlag         ( layer, !isLayerZero && m_ivMvPredFlag[0] ); 
+      }
+    }
 #endif
 #if H_3D_NBDV_REF
@@ -1917 +1901 @@
 #endif
 #if H_3D_VSP
-#if QC_IV_PRED_CONSTRAINT_H0137
     vps.setViewSynthesisPredFlag( layer, !isLayerZero && !isDepth && vps.getNumDirectRefLayers(layer) && m_viewSynthesisPredFlag );         
-#else
-    vps.setViewSynthesisPredFlag( layer, !isLayerZero && !isDepth && m_viewSynthesisPredFlag );         
-#endif
 #endif
 #if H_3D_DBBP