Changeset 466 in 3DVCSoftware for branches/HTM-DEV-0.3-dev1/source

Timestamp:

13 Jun 2013, 12:08:35 (11 years ago)

Author:

hhi

Message:

Integation of depth intra methods in macro H_3D_DIM, including:

• Bugfix for zero residuum check in H_3D_DIM_ENC (former LG_ZEROINTRADEPTHRESI_A0087).

File:

• branches/HTM-DEV-0.3-dev1/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

branches/HTM-DEV-0.3-dev1/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -1534 +1534 @@
         }
         //----- code luma block with given intra prediction mode and store Cbf-----
-#if H_3D_DIM_ENC
-        xIntraCodingLumaBlk( pcCU, uiTrDepth, uiAbsPartIdx, pcOrgYuv, pcPredYuv, pcResiYuv, singleDistYTmp, default0Save1Load2, zeroResi );
-#else
         xIntraCodingLumaBlk( pcCU, uiTrDepth, uiAbsPartIdx, pcOrgYuv, pcPredYuv, pcResiYuv, singleDistYTmp,default0Save1Load2); 
-#endif
         singleCbfYTmp = pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, uiTrDepth );
         //----- code chroma blocks with given intra prediction mode and store Cbf-----
@@ -1643 +1639 @@
       //----- code luma block with given intra prediction mode and store Cbf-----
       dSingleCost   = 0.0;
+#if H_3D_DIM_ENC
+      xIntraCodingLumaBlk( pcCU, uiTrDepth, uiAbsPartIdx, pcOrgYuv, pcPredYuv, pcResiYuv, uiSingleDistY, 0, zeroResi );
+#else
       xIntraCodingLumaBlk( pcCU, uiTrDepth, uiAbsPartIdx, pcOrgYuv, pcPredYuv, pcResiYuv, uiSingleDistY ); 
+#endif
       if( bCheckSplit )
       {