Changeset 305 in 3DVCSoftware for branches/HTM-6.0-LG/source/Lib

Timestamp:

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

Author:

lg

Message:

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

Location:

branches/HTM-6.0-LG/source/Lib

Files:

• TLibCommon/TComPicYuv.cpp (modified) (2 diffs)
• TLibCommon/TComPrediction.cpp (modified) (3 diffs)
• TLibCommon/TComRdCostWeightPrediction.cpp (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncSlice.cpp (modified) (3 diffs)

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

@@ -60 +60 @@
   m_piPicOrgU       = NULL;
   m_piPicOrgV       = NULL;
-  
+
+#if FIX_APPENCTOP_T_ONLY
+  m_cuOffsetY       = NULL;
+  m_cuOffsetC       = NULL;
+  m_buOffsetY       = NULL;
+  m_buOffsetC       = NULL;
+#endif  
+
   m_bIsBorderExtended = false;
 }
@@ -137 +144 @@
   if( m_apiPicBufU ){ xFree( m_apiPicBufU );    m_apiPicBufU = NULL; }
   if( m_apiPicBufV ){ xFree( m_apiPicBufV );    m_apiPicBufV = NULL; }
-
+#if FIX_APPENCTOP_T_ONLY
+  if( m_cuOffsetY )
+  {
+#endif
   delete[] m_cuOffsetY;
   delete[] m_cuOffsetC;
   delete[] m_buOffsetY;
   delete[] m_buOffsetC;
+#if FIX_APPENCTOP_T_ONLY
+  }
+#endif
 }
 

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
   {

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

@@ -106 +106 @@
       piUsed += iStrideUsed;
   }
-#else
+#if FIX_LGE_WP_FOR_3D_C0223
+  }
+  else
+  {
+#endif
+#if FIX_LGE_WP_FOR_3D_C0223 //comment of #else
+    //#else
+#endif
+#endif
   for( ; iRows != 0; iRows-- )
   {
@@ -118 +126 @@
     piCur += iStrideCur;
   }
-    #endif
+#if FIX_LGE_WP_FOR_3D_C0223 //comment of #endif
+  //#endif
+#endif
     #if HHI_INTERVIEW_SKIP
       }

branches/HTM-6.0-LG/source/Lib/TLibCommon/TypeDef.h

@@ -166 +166 @@
 #define HHI_DEPTH_INTRA_SEARCH_RAU_C0160  1   // JCT3V-C0160 change 1: full Intra search in depth random access units 
 #define FIX_POZNAN_CABAC_INIT_FLAG        1
+#define FIX_LGE_WP_FOR_3D_C0223           1   // JCT3V-C0223 Weighted Prediction Bug-fix for 3D-HEVC. Caution! There is still crush using WP with Residual Prediction.
+#define FIX_APPENCTOP_T_ONLY              1   // For Texture-only coding
 
 ///// ***** FCO  *********

branches/HTM-6.0-LG/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1128 +1128 @@
     }
 
+#if !FIX_LGE_WP_FOR_3D_C0223
     if( pcSlice->getRefPicListCombinationFlag() && pcSlice->getPPS()->getWPBiPredIdc()==1 && pcSlice->getSliceType()==B_SLICE )
     {
       pcSlice->setWpParamforLC();
     }
+#endif
     pcSlice->setNoBackPredFlag( false );
     if ( pcSlice->getSliceType() == B_SLICE && !pcSlice->getRefPicListCombinationFlag())

branches/HTM-6.0-LG/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1116 +1116 @@
     }
 #endif
-  
+
+#if FIX_LGE_WP_FOR_3D_C0223
+    if ( (pcSlice->getPPS()->getUseWP() && pcSlice->getSliceType()==P_SLICE) || (pcSlice->getPPS()->getWPBiPredIdc() && pcSlice->getSliceType()==B_SLICE) )
+#else
     if ( (pcSlice->getPPS()->getUseWP() && pcSlice->getSliceType()==P_SLICE) || (pcSlice->getPPS()->getWPBiPredIdc()==1 && pcSlice->getSliceType()==B_SLICE) )
+#endif    
     {
       xCodePredWeightTable( pcSlice );

branches/HTM-6.0-LG/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -677 +677 @@
     xCalcACDCParamSlice(pcSlice);
   }
-
-  Bool bWp_explicit = (pcSlice->getSliceType()==P_SLICE && pcSlice->getPPS()->getUseWP()) || (pcSlice->getSliceType()==B_SLICE && pcSlice->getPPS()->getWPBiPredIdc()==1);
-  Bool bWp_implicit = (pcSlice->getSliceType()==B_SLICE && pcSlice->getPPS()->getWPBiPredIdc()==2);
-
-  if ( bWp_explicit || bWp_implicit )
+#if FIX_LGE_WP_FOR_3D_C0223
+  Bool bWp_explicit = (pcSlice->getSliceType()==P_SLICE && pcSlice->getPPS()->getUseWP()) || (pcSlice->getSliceType()==B_SLICE && pcSlice->getPPS()->getWPBiPredIdc());
+
+  if ( bWp_explicit )
   {
     //------------------------------------------------------------------------------
@@ -690 +689 @@
       printf("Weighted Prediction is not supported with slice mode determined by max number of bins.\n"); exit(0);
     }
+    xEstimateWPParamSlice( pcSlice );
+    pcSlice->initWpScaling();
+#if !FIX_LGE_WP_FOR_3D_C0223 // Interim fix for encoder/decoder mismatch of non-fade sequence
+    // check WP on/off
+    xCheckWPEnable( pcSlice );
+#endif
+  }
+#else
+
+  Bool bWp_explicit = (pcSlice->getSliceType()==P_SLICE && pcSlice->getPPS()->getUseWP()) || (pcSlice->getSliceType()==B_SLICE && pcSlice->getPPS()->getWPBiPredIdc()==1);
+  Bool bWp_implicit = (pcSlice->getSliceType()==B_SLICE && pcSlice->getPPS()->getWPBiPredIdc()==2);
+
+  if ( bWp_explicit || bWp_implicit )
+  {
+    //------------------------------------------------------------------------------
+    //  Weighted Prediction implemented at Slice level. SliceMode=2 is not supported yet.
+    //------------------------------------------------------------------------------
+    if ( pcSlice->getSliceMode()==2 || pcSlice->getEntropySliceMode()==2 )
+    {
+      printf("Weighted Prediction is not supported with slice mode determined by max number of bins.\n"); exit(0);
+    }
 
     if( bWp_explicit )
@@ -704 +724 @@
     }
   }
-
+#endif
 #if ADAPTIVE_QP_SELECTION
   if( m_pcCfg->getUseAdaptQpSelect() )