Changeset 1074 in 3DVCSoftware for branches/HTM-12.1-dev0/source/App/TAppEncoder

Timestamp:

21 Oct 2014, 20:39:50 (10 years ago)

Author:

tech

Message:

Removed 3D-HEVC related macros.

Location:

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

Files:

• TAppEncCfg.cpp (modified) (5 diffs)
• TAppEncCfg.h (modified) (2 diffs)
• TAppEncTop.cpp (modified) (10 diffs)

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

@@ -398 +398 @@
 #if H_3D_DIM
   ("DMM",                   m_useDMM,           true,  "Depth intra model modes")
-#if SEPARATE_FLAG_I0085
   ("IVP",                   m_useIVP,           true,  "intra-view prediction")
-#endif
   ("SDC",                   m_useSDC,           true,  "Simplified depth coding")
   ("DLT",                   m_useDLT,           true,  "Depth lookup table")
@@ -814 +812 @@
 
 #endif //HHI_VSO
-#if MTK_I0099_VPS_EX2
+#if H_3D_QTLPC
   ("LimQtPredFlag",                   m_bLimQtPredFlag          , true          , "Use Predictive Coding with QTL" )
-#endif
-#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
-#if H_3D_QTLPC
   ("QTL",                             m_bUseQTL                 , true          , "Use depth Quadtree Limitation" )
-#if !MTK_I0099_VPS_EX2
-  ("PC",                              m_bUsePC                  , true          , "Use Predictive Coding with QTL" )
-#endif
-#endif
 #endif
 #if H_3D_IV_MERGE
@@ -1540 +1531 @@
     for ( Int i = 0; i < m_layerIdsInSets[lsIdx].size(); i++ )
     {
-#if FIX_TICKET_61
       xConfirmPara( m_layerIdsInSets[lsIdx][i] < 0 || m_layerIdsInSets[lsIdx][i] >= MAX_NUM_LAYER_IDS, "LayerIdsInSet must be greater than 0 and less than MAX_NUM_LAYER_IDS" ); 
-#else
-      xConfirmPara( m_layerIdsInSets[lsIdx][i] < 0 || m_layerIdsInSets[lsIdx].size() >= MAX_NUM_LAYER_IDS, "LayerIdsInSet must be greater than and less than MAX_NUM_LAYER_IDS" ); 
-#endif
     }
   }
@@ -2676 +2663 @@
   printf("WVSO:%d ", m_bUseWVSO );  
 #endif
-#if MTK_I0099_VPS_EX2
+#if H_3D_QTLPC
   printf("LimQtPredFlag:%d ", m_bLimQtPredFlag ? 1 : 0);
-#endif
-#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
-#if H_3D_QTLPC
   printf("QTL:%d ", m_bUseQTL);
-#if !MTK_I0099_VPS_EX2
-  printf("PC:%d " , m_bUsePC );
-#endif
-#endif
 #endif
 #if H_3D_IV_MERGE
@@ -2712 +2692 @@
 #if H_3D_DIM
   printf("DMM:%d ", m_useDMM );
-#if SEPARATE_FLAG_I0085
   printf("IVP:%d ", m_useIVP );
-#endif
   printf("SDC:%d ", m_useSDC );
   printf("DLT:%d ", m_useDLT );

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

@@ -151 +151 @@
 #endif
 #endif
-#if MTK_I0099_VPS_EX2
+#if H_3D_QTLPC
   Bool                   m_bLimQtPredFlag;
 #endif
@@ -504 +504 @@
 #if H_3D_DIM
   Bool      m_useDMM;                                        ///< flag for using DMM
-#if SEPARATE_FLAG_I0085
   Bool      m_useIVP;
-#endif
   Bool      m_useSDC;                                        ///< flag for using SDC
   Bool      m_useDLT;                                        ///< flag for using DLT
 #endif
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   Bool     m_useSingleDepthMode;                          ///< flag for using single depth mode
 #endif
-#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
 #if H_3D_QTLPC
   Bool      m_bUseQTL;                                        ///< flag for using depth QuadTree Limitation
-#if !MTK_I0099_VPS_EX2
-  Bool      m_bUsePC;                                         ///< flag for using Predictive Coding with QTL
-#endif
-#endif
 #endif
 #if H_3D_INTER_SDC

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

@@ -233 +233 @@
 #if H_3D_DIM
     m_cTEncTop.setUseDMM                       ( isDepth ? m_useDMM               : false );
-#if SEPARATE_FLAG_I0085
-#if LGE_FCO_I0116
+#if H_3D_FCO
     m_cTEncTop.setUseIVP                       ( vps.getViewIndex( layerId ) == 0 && isDepth ? m_useIVP               : false );
 #else
     m_cTEncTop.setUseIVP                       ( isDepth ? m_useIVP               : false );
-#endif
 #endif
     m_cTEncTop.setUseSDC                       ( isDepth ? m_useSDC               : false );
     m_cTEncTop.setUseDLT                       ( isDepth ? m_useDLT               : false );
 #endif
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
     m_cTEncTop.setUseSingleDepthMode           ( isDepth ? m_useSingleDepthMode   : false );
 #endif
-#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
 #if H_3D_QTLPC
-#if LGE_FCO_I0116
-    m_cTEncTop.setUseQTL                       ( vps.getViewIndex( layerId ) == 0 && isDepth ? m_bUseQTL               : false );
-#else
     m_cTEncTop.setUseQTL                       ( isDepth ? m_bUseQTL               : false );
-#endif
-#if !MTK_I0099_VPS_EX2    
-    m_cTEncTop.setUsePC                        ( isDepth ? m_bUsePC                : false );
-#endif
-#endif
 #endif
     //====== Depth Inter SDC =========
@@ -266 +255 @@
 #endif
 #if H_3D_IV_MERGE
-#if LGE_FCO_I0116
+#if H_3D_FCO
     m_cTEncTop.setUseMPI                       ( vps.getViewIndex( layerId ) == 0 && isDepth ? m_bMPIFlag    : false );
 #else
@@ -2159 +2148 @@
     Bool isDepth      = ( vps.getDepthId( layer ) == 1 ) ;
     Bool isLayerZero  = ( layer == 0 ); 
-#if LGE_FCO_I0116
+#if H_3D_FCO
     Bool isDepthFirst = (layer > 1 ? true : false);
 #endif
@@ -2171 +2160 @@
     {
       vps.setSubPULog2Size         ( layer, (layer != 1) ? 6: 0 ); 
-#if MTK_I0099_VPS_EX2
       vps.setSubPUMPILog2Size      ( layer, (!isLayerZero) ? m_iSubPUMPILog2Size: 0 ); 
-#endif
     }
     else
@@ -2183 +2170 @@
 #if H_3D_DIM
     vps.setVpsDepthModesFlag( layer, isDepth && !isLayerZero && (m_useDMM || m_useSDC || m_useDLT ) );
-#if SEPARATE_FLAG_I0085
-#if LGE_FCO_I0116
+#if H_3D_FCO
     vps.setIVPFlag          ( layer, isDepth && !isLayerZero && m_useIVP && !isDepthFirst );
 #else
     vps.setIVPFlag          ( layer, isDepth && !isLayerZero && m_useIVP );
-#endif
 #endif
 #endif
@@ -2196 +2181 @@
     {
       vps.setIvMvPredFlag    (layer, false);
-#if SEC_HLS_CLEANUP_I0100
       vps.setIvMvScalingFlag (layer, false); 
-#endif
     }
     else
@@ -2210 +2193 @@
         vps.setIvMvPredFlag         ( layer, !isLayerZero && m_ivMvPredFlag[0] ); 
       }
-#if SEC_HLS_CLEANUP_I0100
       vps.setIvMvScalingFlag (layer, m_ivMvScalingFlag); 
-#endif
-    }
-#endif
-#if MTK_I0099_VPS_EX2
-#if LGE_FCO_I0116
+    }
+#endif
+#if H_3D_QTLPC
+#if H_3D_FCO
     vps.setLimQtPredFlag         ( layer, isDepth && m_bLimQtPredFlag && !isDepthFirst ); 
 #else
@@ -2235 +2216 @@
 #endif
 #if H_3D_IV_MERGE
-#if LGE_FCO_I0116
+#if H_3D_FCO
     vps.setMPIFlag( layer, !isLayerZero && isDepth && m_bMPIFlag && !isDepthFirst );
 #else
@@ -2242 +2223 @@
 #endif
   }  
-#if !MTK_I0099_VPS_EX2
-#if H_3D_SPIVMP
-  vps.setSubPUMPILog2Size( m_iSubPUMPILog2Size );
-#endif
-#endif
-#if H_3D
-#if !SEC_HLS_CLEANUP_I0100
-  vps.setIvMvScalingFlag( m_ivMvScalingFlag );   
-#endif
-#endif
 }
 
@@ -2273 +2244 @@
       xAnalyzeInputBaseDepth(layer, max(m_iIntraPeriod[layer], 24), &vps, &dlt);
       bDltPresentFlag = bDltPresentFlag || dlt.getUseDLTFlag(layer);
-#if H_3D_DELTA_DLT
       dlt.setInterViewDltPredEnableFlag(layer, (dlt.getUseDLTFlag(layer) && (layer>1)));
-#endif
     }
   }