Changeset 480 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2a/source/Lib

Timestamp:

19 Jun 2013, 07:13:02 (12 years ago)

Author:

lg

Message:

-minor non-normative fix of IC

Location:

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder

Files:

• TEncSearch.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)

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

@@ -4253 +4253 @@
   else
   {
-    xPredInterLumaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand, false 
+    xPredInterLumaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand, false
+#if H_3D_ARP
+      , false
+#endif
 #if H_3D_IC
     , bICFlag

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -936 +936 @@
   UInt uiTilesAcross  = 0;
 #if H_3D_IC
-  if ( pcEncTop->getViewIndex() && pcEncTop->getUseIC() ) // DCP of ViewID 0 is not available
+  if ( pcEncTop->getViewIndex() && pcEncTop->getUseIC() &&
+       !( ( pcSlice->getSliceType() == P_SLICE && pcSlice->getPPS()->getUseWP() ) || ( pcSlice->getSliceType() == B_SLICE && pcSlice->getPPS()->getWPBiPred() ) )
+     )
   {
     pcSlice ->xSetApplyIC();