Changeset 1132 in 3DVCSoftware

Timestamp:

18 Feb 2015, 18:06:13 (10 years ago)

Author:

tech

Message:

Merged TICKET083_IVPFLAG_FIX.

Location:

branches/HTM-13.0-dev0/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (3 diffs)
• TLibEncoder/TEncSearch.cpp (modified) (1 diff)

branches/HTM-13.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -350 +350 @@
                                               // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
                                               // LG_ZEROINTRADEPTHRESI_A0087
+
+#define TICKET083_IVPFLAG_FIX             1
 #endif
 ///// ***** VIEW SYNTHESIS PREDICTION *********

branches/HTM-13.0-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1041 +1041 @@
 #if H_3D_DIM
             Bool bOnlyIVP = false;
+#if TICKET083_IVPFLAG_FIX
+            Bool bUseIVP = true;
+#endif
             if( rpcBestCU->getSlice()->getIsDepth() && !(rpcBestCU->getSlice()->isIRAP()) && 
                 rpcBestCU->getSlice()->getSliceType() != I_SLICE && 
@@ -1049 +1052 @@
             { 
               bOnlyIVP = true;
+#if TICKET083_IVPFLAG_FIX
+              bUseIVP = rpcBestCU->getSlice()->getIntraContourFlag();
+#endif
             }
+#if TICKET083_IVPFLAG_FIX
+            if( bUseIVP )
+            {
+#endif
             xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bOnlyIVP );
 #else
@@ -1083 +1093 @@
 #endif
             }
+#if TICKET083_IVPFLAG_FIX
+          }
+#endif
           }
         // test PCM

branches/HTM-13.0-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3114 +3114 @@
     if( m_pcEncCfg->getIsDepth() && uiWidth >= DIM_MIN_SIZE && uiWidth <= DIM_MAX_SIZE && uiWidth == uiHeight )
     {
+#if TICKET083_IVPFLAG_FIX
+      if( bOnlyIVP )
+#else
       if( bOnlyIVP && pcCU->getSlice()->getIntraContourFlag() )
+#endif
       {
         TComWedgelet* dmm4Segmentation = new TComWedgelet( uiWidth, uiHeight );