Changeset 1234 in SHVCSoftware

Timestamp:

9 Jul 2015, 01:03:38 (9 years ago)

Author:

seregin

Message:

port rev 4186

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (1 diff)
• TLibCommon/TComDataCU.h (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -944 +944 @@
 }
 
-Void TComDataCU::copyToPic( UChar uhDepth, UInt uiPartIdx, UInt uiPartDepth )
-{
-  TComDataCU*   pCtu       = m_pcPic->getCtu( m_ctuRsAddr );
-  UInt          uiQNumPart  = m_uiNumPartition>>(uiPartDepth<<1);
-
-  UInt uiPartStart          = uiPartIdx*uiQNumPart;
-  UInt uiPartOffset         = m_absZIdxInCtu + uiPartStart;
-
-  const UInt numValidComp=pCtu->getPic()->getNumberValidComponents();
-  const UInt numValidChan=pCtu->getPic()->getChromaFormat()==CHROMA_400 ? 1:2;
-
-  pCtu->getTotalCost()       = m_dTotalCost;
-  pCtu->getTotalDistortion() = m_uiTotalDistortion;
-  pCtu->getTotalBits()       = m_uiTotalBits;
-
-  Int iSizeInUchar  = sizeof( UChar  ) * uiQNumPart;
-  Int iSizeInBool   = sizeof( Bool   ) * uiQNumPart;
-  Int sizeInChar  = sizeof( Char ) * uiQNumPart;
-
-  memcpy( pCtu->getSkipFlag()       + uiPartOffset, m_skipFlag,   sizeof( *m_skipFlag )   * uiQNumPart );
-
-  memcpy( pCtu->getQP() + uiPartOffset, m_phQP, sizeInChar );
-  memcpy( pCtu->getPartitionSize()  + uiPartOffset, m_pePartSize, sizeof( *m_pePartSize ) * uiQNumPart );
-  memcpy( pCtu->getPredictionMode() + uiPartOffset, m_pePredMode, sizeof( *m_pePredMode ) * uiQNumPart );
-
-  memcpy( pCtu->getCUTransquantBypass()+ uiPartOffset, m_CUTransquantBypass, sizeof( *m_CUTransquantBypass ) * uiQNumPart );
-  memcpy( pCtu->getMergeFlag()         + uiPartOffset, m_pbMergeFlag,         iSizeInBool  );
-  memcpy( pCtu->getMergeIndex()        + uiPartOffset, m_puhMergeIndex,       iSizeInUchar );
-  for (UInt ch=0; ch<numValidChan; ch++)
-  {
-    memcpy( pCtu->getIntraDir(ChannelType(ch)) + uiPartOffset, m_puhIntraDir[ch], iSizeInUchar );
-  }
-
-  memcpy( pCtu->getInterDir()          + uiPartOffset, m_puhInterDir,         iSizeInUchar );
-  memcpy( pCtu->getTransformIdx()      + uiPartOffset, m_puhTrIdx,            iSizeInUchar );
-
-  for(UInt comp=0; comp<numValidComp; comp++)
-  {
-    memcpy( pCtu->getCrossComponentPredictionAlpha(ComponentID(comp)) + uiPartOffset, m_crossComponentPredictionAlpha[comp], iSizeInUchar );
-    memcpy( pCtu->getTransformSkip(ComponentID(comp) )                + uiPartOffset, m_puhTransformSkip[comp],   iSizeInUchar );
-    memcpy( pCtu->getCbf(ComponentID(comp))                           + uiPartOffset, m_puhCbf[comp],             iSizeInUchar );
-    memcpy( pCtu->getExplicitRdpcmMode(ComponentID(comp) )            + uiPartOffset, m_explicitRdpcmMode[comp],  iSizeInUchar );
-  }
-
-  memcpy( pCtu->getDepth()  + uiPartOffset, m_puhDepth,  iSizeInUchar );
-  memcpy( pCtu->getWidth()  + uiPartOffset, m_puhWidth,  iSizeInUchar );
-  memcpy( pCtu->getHeight() + uiPartOffset, m_puhHeight, iSizeInUchar );
-
-  for(UInt i=0; i<NUM_REF_PIC_LIST_01; i++)
-  {
-    const RefPicList rpl=RefPicList(i);
-    memcpy( pCtu->getMVPIdx(rpl) + uiPartOffset, m_apiMVPIdx[rpl], iSizeInUchar );
-    memcpy( pCtu->getMVPNum(rpl) + uiPartOffset, m_apiMVPNum[rpl], iSizeInUchar );
-  }
-
-  for(UInt i=0; i<NUM_REF_PIC_LIST_01; i++)
-  {
-    const RefPicList rpl=RefPicList(i);
-    m_acCUMvField[rpl].copyTo( pCtu->getCUMvField( rpl ), m_absZIdxInCtu, uiPartStart, uiQNumPart );
-  }
-
-  memcpy( pCtu->getIPCMFlag() + uiPartOffset, m_pbIPCMFlag,         iSizeInBool  );
-
-  const UInt numCoeffY    = (g_uiMaxCUWidth*g_uiMaxCUHeight)>>((uhDepth+uiPartDepth)<<1);
-  const UInt offsetY      = uiPartOffset*m_pcPic->getMinCUWidth()*m_pcPic->getMinCUHeight();
-  for (UInt comp=0; comp<numValidComp; comp++)
-  {
-    UInt componentShift = m_pcPic->getComponentScaleX(ComponentID(comp)) + m_pcPic->getComponentScaleY(ComponentID(comp));
-    memcpy( pCtu->getCoeff(ComponentID(comp)) + (offsetY>>componentShift), m_pcTrCoeff[comp], sizeof(TCoeff)*(numCoeffY>>componentShift) );
-#if ADAPTIVE_QP_SELECTION
-    memcpy( pCtu->getArlCoeff(ComponentID(comp)) + (offsetY>>componentShift), m_pcArlCoeff[comp], sizeof(TCoeff)*(numCoeffY>>componentShift) );
-#endif
-    memcpy( pCtu->getPCMSample(ComponentID(comp)) + (offsetY>>componentShift), m_pcIPCMSample[comp], sizeof(Pel)*(numCoeffY>>componentShift) );
-  }
-
-  pCtu->getTotalBins() = m_uiTotalBins;
-}
-
 // --------------------------------------------------------------------------------------------------------------------
 // Other public functions

branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h

@@ -202 +202 @@
 
   Void          copyToPic             ( UChar uiDepth );
-  Void          copyToPic             ( UChar uiDepth, UInt uiPartIdx, UInt uiPartDepth );
-
+  
   // -------------------------------------------------------------------------------------------------------------------
   // member functions for CU description

branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2975 +2975 @@
   pcCU->getTotalDistortion() = uiDistortion;
 
-  pcCU->copyToPic(uiDepth, 0, 0);
+  pcCU->copyToPic(uiDepth);
 }