Changeset 305 in 3DVCSoftware for branches/HTM-6.0-LG/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

15 Mar 2013, 05:18:01 (11 years ago)

Author:

lg

Message:

JCT3V-C0223 with Macro FIX_LGE_WP_FOR_3D_C0223 & For texture-only coding Macro FIX_APPENCTOP_T_ONLY

File:

• branches/HTM-6.0-LG/source/Lib/TLibCommon/TComPrediction.cpp (modified) (3 diffs)

branches/HTM-6.0-LG/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1066 +1066 @@
     else
     {
+#if FIX_LGE_WP_FOR_3D_C0223
+      if ( ( pcCU->getSlice()->getPPS()->getUseWP()      && pcCU->getSlice()->getSliceType() == P_SLICE ) || 
+         ( pcCU->getSlice()->getPPS()->getWPBiPredIdc() && pcCU->getSlice()->getSliceType() == B_SLICE ) )
+#else
       if ( pcCU->getSlice()->getPPS()->getWPBiPredIdc() )
+#endif
       {
 #if DEPTH_MAP_GENERATION
@@ -1100 +1105 @@
     }
   }
-
+#if FIX_LGE_WP_FOR_3D_C0223
+  if ( pcCU->getSlice()->getPPS()->getWPBiPredIdc() && pcCU->getSlice()->getSliceType() == B_SLICE  )
+#else
   if ( pcCU->getSlice()->getPPS()->getWPBiPredIdc() )
+#endif
   {
 #if MERL_VSP_C0152
@@ -1110 +1118 @@
     xWeightedPredictionBi( pcCU, &m_acYuvPred[0], &m_acYuvPred[1], iRefIdx[0], iRefIdx[1], uiPartAddr, iWidth, iHeight, rpcYuvPred );
   }
+#if FIX_LGE_WP_FOR_3D_C0223
+  else if ( pcCU->getSlice()->getPPS()->getUseWP() && pcCU->getSlice()->getSliceType() == P_SLICE )
+#endif
+  {
+#if MERL_VSP_C0152
+    if(pcCU->getVSPIndex(uiPartAddr))
+      m_acYuvPred[0].copyPartToPartYuv( rpcYuvPred, uiPartAddr, iWidth, iHeight );
+    else
+#endif
+      xWeightedPredictionUni( pcCU, &m_acYuvPred[0], uiPartAddr, iWidth, iHeight, REF_PIC_LIST_0, rpcYuvPred, iPartIdx ); 
+  }
+
+
+
+
+
   else
   {