Changeset 650 in 3DVCSoftware for branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

21 Oct 2013, 11:18:36 (12 years ago)

Author:

tech

Message:

Fixed H_3D_FAST_TEXTURE_ENCODING macro.

File:

• branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.cpp (modified) (23 diffs)

branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.cpp

@@ -517 +517 @@
   if(!bSliceEnd && !bSliceStart && bInsidePicture )
   {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
     Bool bIVFMerge = false;
     Int  iIVFMaxD = 0;
@@ -588 +588 @@
         }
       }
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
       if(rpcTempCU->getSlice()->getViewIndex() && !rpcTempCU->getSlice()->getIsDepth())
       {
@@ -612 +612 @@
           rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
 #endif
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
           xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bFMD );  rpcTempCU->initEstData( uiDepth, iQP );//by Competition for inter_2Nx2N
 #else
@@ -626 +626 @@
 #endif
         xCheckRDCostMerge2Nx2N( rpcBestCU, rpcTempCU, &earlyDetectionSkipMode );//by Merge for inter_2Nx2N
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
         bFMD = bIVFMerge && rpcBestCU->isSkipped(0);
 #endif
@@ -652 +652 @@
             rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
 #endif
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
             xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bFMD );  rpcTempCU->initEstData( uiDepth, iQP );
 #else
@@ -760 +760 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_NxN, bFMD  );
 #else
@@ -780 +780 @@
             )
           {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
             xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_Nx2N, bFMD  );
 #else
@@ -800 +800 @@
             )
           {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
             xCheckRDCostInter      ( rpcBestCU, rpcTempCU, SIZE_2NxN, bFMD  );
 #else
@@ -839 +839 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU, bFMD );
 #else
@@ -859 +859 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD, bFMD );
 #else
@@ -883 +883 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU, bFMD, true );
 #else
@@ -903 +903 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD, bFMD, true );
 #else
@@ -929 +929 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N, bFMD );
 #else
@@ -949 +949 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N, bFMD );
 #else
@@ -969 +969 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N, bFMD, true );
 #else
@@ -989 +989 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N, bFMD, true );
 #else
@@ -1040 +1040 @@
 #endif
         }
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
         if(!bFMD)
         {
@@ -1122 +1122 @@
           }
         }
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
         }
 #endif
@@ -1167 +1167 @@
       bSubBranch = true;
     }
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
     if(rpcBestCU->getSlice()->getViewIndex() && !rpcBestCU->getSlice()->getIsDepth() && (uiDepth >=iIVFMaxD) && rpcBestCU->isSkipped(0))
     {
@@ -2044 +2044 @@
 
 #if AMP_MRG
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
 Void TEncCu::xCheckRDCostInter( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize, Bool bFMD, Bool bUseMRG)
 #else
@@ -2053 +2053 @@
 #endif
 {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
   if(!(bFMD && (ePartSize == SIZE_2Nx2N)))  //have  motion estimation or merge check
   {
@@ -2130 +2130 @@
 #if AMP_MRG
   rpcTempCU->setMergeAMP (true);
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
   m_pcPredSearch->predInterSearch ( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcRecoYuvTemp[uhDepth], bFMD, false, bUseMRG );
 #else
@@ -2245 +2245 @@
   }
 #endif
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
   }
 #endif