Changeset 1007 in 3DVCSoftware for branches/HTM-11.2-dev2-MediaTek/source/App

Timestamp:

22 Jul 2014, 10:27:09 (10 years ago)

Author:

mediatek-htm

Message:

JCT3V-I0099. Changes of sub-PU size signaling and lim_qt_pred_flag signaling in VPS extension 2. Remove use_qtl_flag and use_pc_flag.

Location:

branches/HTM-11.2-dev2-MediaTek/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (2 diffs)
• TAppEncTop.cpp (modified) (4 diffs)

branches/HTM-11.2-dev2-MediaTek/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -761 +761 @@
 
 #endif //HHI_VSO
+#if MTK_I0099_VPS_EX2
+  ("LimQtPredFlag",                   m_bLimQtPredFlag          , true          , "Use Predictive Coding with QTL" )
+#endif
+#if !MTK_I0099_VPS_EX2
 #if H_3D_QTLPC
   ("QTL",                             m_bUseQTL                 , true          , "Use depth Quadtree Limitation" )
   ("PC",                              m_bUsePC                  , true          , "Use Predictive Coding with QTL" )
+#endif
 #endif
 #if H_3D_IV_MERGE
@@ -2491 +2496 @@
   printf("WVSO:%d ", m_bUseWVSO );  
 #endif
+#if MTK_I0099_VPS_EX2
+  printf("LimQtPredFlag:%d", m_bLimQtPredFlag ? 1 : 0);
+#endif
+#if !MTK_I0099_VPS_EX2
 #if H_3D_QTLPC
   printf("QTL:%d ", m_bUseQTL);
   printf("PC:%d " , m_bUsePC );
+#endif
 #endif
 #if H_3D_IV_MERGE

branches/HTM-11.2-dev2-MediaTek/source/App/TAppEncoder/TAppEncCfg.h

@@ -128 +128 @@
   vector<Bool>           m_ivMvPredFlag;                      ///< Interview motion vector prediction 
 #if H_3D_SPIVMP
-  Int                    m_iSubPULog2Size;                    
-  Int                    m_iSubPUMPILog2Size;                    
-#endif
+  Int                    m_iSubPULog2Size;   
+  Int                    m_iSubPUMPILog2Size;   
+#endif
+#endif
+#if MTK_I0099_VPS_EX2
+  Bool                   m_bLimQtPredFlag;
 #endif
 #if H_3D_ARP                                                  /// < flag and number of weighting factors in ARP
@@ -473 +476 @@
   Bool      m_useDLT;                                        ///< flag for using DLT
 #endif
+#if !MTK_I0099_VPS_EX2
 #if H_3D_QTLPC
   Bool      m_bUseQTL;                                        ///< flag for using depth QuadTree Limitation
   Bool      m_bUsePC;                                         ///< flag for using Predictive Coding with QTL
+#endif
 #endif
 #if H_3D_INTER_SDC

branches/HTM-11.2-dev2-MediaTek/source/App/TAppEncoder/TAppEncTop.cpp

@@ -202 +202 @@
     m_cTEncTop.setUseDLT                       ( isDepth ? m_useDLT               : false );
 #endif
+#if !MTK_I0099_VPS_EX2
 #if H_3D_QTLPC
     m_cTEncTop.setUseQTL                       ( isDepth ? m_bUseQTL               : false );
     m_cTEncTop.setUsePC                        ( isDepth ? m_bUsePC                : false );
+#endif
 #endif
     //====== Depth Inter SDC =========
@@ -1815 +1817 @@
     {
       vps.setSubPULog2Size         ( layer, (layer != 1) ? 6: 0 ); 
+#if MTK_I0099_VPS_EX2
+      vps.setSubPUMPILog2Size      ( layer, (!isLayerZero) ? m_iSubPUMPILog2Size: 0 ); 
+#endif
     }
     else
@@ -1843 +1848 @@
     }
 #endif
+#if MTK_I0099_VPS_EX2
+    vps.setLimQtPredFlag         ( layer, isDepth && m_bLimQtPredFlag ); 
+#endif
 #if H_3D_NBDV_REF
     vps.setDepthRefinementFlag  ( layer, !isLayerZero && !isDepth && m_depthRefinementFlag );         
@@ -1859 +1867 @@
 #endif
   }  
+#if !MTK_I0099_VPS_EX2
 #if H_3D_SPIVMP
   vps.setSubPUMPILog2Size( m_iSubPUMPILog2Size );
+#endif
 #endif
 #if H_3D