Changeset 1303 in 3DVCSoftware for branches/HTM-14.1-update-dev1-LG/source/Lib/TLibEncoder/TEncSearch.cpp

Timestamp:

28 Jul 2015, 03:59:07 (9 years ago)

Author:

lg

Message:

Integration of inter SDC

File:

• branches/HTM-14.1-update-dev1-LG/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (17 diffs)

branches/HTM-14.1-update-dev1-LG/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -44 +44 @@
 #include <math.h>
 #include <limits>
-#if H_3D_INTER_SDC
-#include <memory.h>
-#endif
-
 
 //! \ingroup TLibEncoder
@@ -372 +368 @@
   m_cDistParam.bUseIC = pcPatternKey->getICFlag();
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
   m_cDistParam.bUseSDCMRSAD = pcPatternKey->getSDCMRSADFlag();
 #endif
@@ -883 +879 @@
     m_cDistParam.bUseIC = pcPatternKey->getICFlag();
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
     m_cDistParam.bUseSDCMRSAD = pcPatternKey->getSDCMRSADFlag();
 #endif
@@ -2907 +2903 @@
       distParam.bUseIC = false;
 #endif
-#if H_3D_INTER_SDC_FIX
+#if NH_3D_SDC_INTER
       distParam.bUseSDCMRSAD = false;
 #endif
@@ -3847 +3843 @@
   cDistParam.bUseIC = false;
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
   cDistParam.bUseSDCMRSAD = false;
 #endif
@@ -5057 +5053 @@
   pcPatternKey->setICFlag( bICFlag );
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
    pcPatternKey->setSDCMRSADFlag( pcCU->getSlice()->getInterSdcFlag() );
 #endif
@@ -5246 +5242 @@
       m_cDistParam.bUseIC = pcPatternKey->getICFlag();
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
       m_cDistParam.bUseSDCMRSAD = pcPatternKey->getSDCMRSADFlag();
 #endif
@@ -5964 +5960 @@
 }
 
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
 Void TEncSearch::encodeResAndCalcRdInterSDCCU( TComDataCU* pcCU, TComYuv* pcOrg, TComYuv* pcPred, TComYuv* pcResi, TComYuv* pcRec, Int uiOffest, const UInt uiDepth )
 {
@@ -5978 +5974 @@
 
   Pel *pPred, *pOrg;
-  UInt uiPredStride = pcPred->getStride();
-  UInt uiOrgStride  = pcOrg->getStride();
+  UInt uiPredStride = pcPred->getStride( COMPONENT_Y );
+  UInt uiOrgStride  = pcOrg->getStride( COMPONENT_Y );
   UInt uiPelX, uiPelY;
 
-  pPred = pcPred->getLumaAddr( 0 );
-  pOrg  = pcOrg->getLumaAddr( 0 );
+  pPred = pcPred->getAddr( COMPONENT_Y );
+  pOrg  = pcOrg->getAddr( COMPONENT_Y );
   Int pResDC = 0;
+  Int bitDepthY = pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA);
+  Int bitDepthC = pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_CHROMA);
 
   //calculate dc value for prediction and original signal, and calculate residual and reconstruction
@@ -6005 +6003 @@
 
   Pel *pRec;
-  UInt uiRecStride  = pcRec->getStride();
-  pPred = pcPred->getLumaAddr( 0 );
-  pRec  = pcRec->getLumaAddr( 0 );
+  UInt uiRecStride  = pcRec->getStride( COMPONENT_Y );
+  pPred = pcPred->getAddr( COMPONENT_Y );
+  pRec  = pcRec->getAddr( COMPONENT_Y );
 
   for( uiPelY = 0; uiPelY < uiHeight; uiPelY++ )
@@ -6013 +6011 @@
     for( uiPelX = 0; uiPelX < uiWidth; uiPelX++ )
     {
-      pRec[ uiPelX ] = Clip3( 0, ( 1 << g_bitDepthY ) - 1, pPred[uiPelX] + pcCU->getSDCSegmentDCOffset(0, 0) );
+      pRec[ uiPelX ] = Clip3( 0, (1 << bitDepthY) - 1, pPred[uiPelX] + pcCU->getSDCSegmentDCOffset(0, 0) );
     }
     pPred     += uiPredStride;
@@ -6020 +6018 @@
 
   // clear UV
-  UInt  uiStrideC     = pcRec->getCStride();
-  Pel   *pRecCb       = pcRec->getCbAddr();
-  Pel   *pRecCr       = pcRec->getCrAddr();
+  UInt  uiStrideC     = pcRec->getStride( COMPONENT_Cb );
+  Pel   *pRecCb       = pcRec->getAddr( COMPONENT_Cb );
+  Pel   *pRecCr       = pcRec->getAddr( COMPONENT_Cr );
 
   for (Int y=0; y < uiHeight/2; y++)
@@ -6028 +6026 @@
     for (Int x=0; x < uiWidth/2; x++)
     {
-      pRecCb[x] = (Pel)( 1 << ( g_bitDepthC - 1 ) );
-      pRecCr[x] = (Pel)( 1 << ( g_bitDepthC - 1 ) );
+      pRecCb[x] = (Pel)( 1 << ( bitDepthC - 1 ) );
+      pRecCr[x] = (Pel)( 1 << ( bitDepthC - 1 ) );
     }
 
@@ -6038 +6036 @@
   Dist ruiDist;
   Double rdCost;
-#if H_3D_VSO // M13
+#if NH_3D_VSO // M13
   if ( m_pcRdCost->getUseVSO() )
   {
-    ruiDist = m_pcRdCost->getDistPartVSO( pcCU, 0, pcRec->getLumaAddr(), pcRec->getStride(),  pcOrg->getLumaAddr(), pcOrg->getStride(),  uiWidth,      uiHeight     , false );
+    ruiDist = m_pcRdCost->getDistPartVSO( pcCU, 0, bitDepthY, pcRec->getAddr( COMPONENT_Y ), pcRec->getStride( COMPONENT_Y ),  pcOrg->getAddr( COMPONENT_Y ), pcOrg->getStride( COMPONENT_Y ),  uiWidth,      uiHeight     , false );
   }
   else    
@@ -6047 +6045 @@
 #endif
     {
-      ruiDist = m_pcRdCost->getDistPart( g_bitDepthY, pcRec->getLumaAddr( 0 ), uiRecStride, pcOrg->getLumaAddr( 0 ), uiOrgStride, uiWidth, uiHeight );
-    }
-#if H_3D_VSO
-  }
-#endif
-
-#if NH_3D_SDC_INTRA
+      ruiDist = m_pcRdCost->getDistPart( bitDepthY, pcRec->getAddr( COMPONENT_Y ), uiRecStride, pcOrg->getAddr( COMPONENT_Y ), uiOrgStride, uiWidth, uiHeight, COMPONENT_Y );
+    }
+#if NH_3D_VSO
+  }
+#endif
+
   Bool bNonSkip = false;
-#else
-  Bool bNonSkip = true;
-#endif
   bNonSkip |= ( pcCU->getSDCSegmentDCOffset( 0, 0 ) != 0 ) ? 1 : 0;
   if( !bNonSkip )
@@ -6069 +6063 @@
     //----- determine rate and r-d cost -----
     UInt uiBits = 0;
-    TComYuv *pDummy = NULL;
     m_pcRDGoOnSbacCoder->load( m_pppcRDSbacCoder[pcCU->getDepth(0)][CI_CURR_BEST] );
 
-    xAddSymbolBitsInter( pcCU, 0, 0, uiBits, pDummy, NULL, pDummy );
-
-#if H_3D_VSO //M 14
+    xAddSymbolBitsInter( pcCU, uiBits );
+
+#if NH_3D_VSO //M 14
     if ( m_pcRdCost->getUseLambdaScaleVSO() )    
     {
@@ -6092 +6085 @@
   }
 
-#if H_3D_VSO // necessary? // M15
+#if NH_3D_VSO // necessary? // M15
   // set Model
   if( !m_pcRdCost->getUseEstimatedVSD() && m_pcRdCost->getUseRenModel() )
   {
-    Pel*  piSrc       = pcRec->getLumaAddr();
-    UInt  uiSrcStride = pcRec->getStride();
+    Pel*  piSrc       = pcRec->getAddr( COMPONENT_Y );
+    UInt  uiSrcStride = pcRec->getStride( COMPONENT_Y );
     m_pcRdCost->setRenModelData( pcCU, 0, piSrc, uiSrcStride, uiWidth, uiHeight );
   }