Changeset 1440 in SHVCSoftware


Ignore:
Timestamp:
12 Aug 2015, 20:19:52 (9 years ago)
Author:
seregin
Message:

remove virtual for create functions in *3DAsymLUT classes, signature is anyway different

Location:
branches/SHM-dev/source/Lib
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibCommon/TCom3DAsymLUT.h

    r1335 r1440  
    6363  TCom3DAsymLUT();
    6464  virtual ~TCom3DAsymLUT();
    65 
    66   virtual Void create( Int nMaxOctantDepth, Int nInputBitDepth, Int nInputBitDepthC, Int nOutputBitDepth, Int nOutputBitDepthC, Int nMaxYPartNumLog2, Int nAdaptCThresholdU, Int nAdaptCThresholdV );
     65   
     66  Void create( Int nMaxOctantDepth, Int nInputBitDepth, Int nInputBitDepthC, Int nOutputBitDepth, Int nOutputBitDepthC, Int nMaxYPartNumLog2, Int nAdaptCThresholdU, Int nAdaptCThresholdV );
    6767  virtual Void destroy();
    6868

  • branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp

    r1437 r1440  
    9090}
    9191
    92 Void TEnc3DAsymLUT::create( Int nMaxOctantDepth , Int nInputBitDepth , Int nInputBitDepthC , Int nOutputBitDepth , Int nOutputBitDepthC , Int nMaxYPartNumLog2 )
     92Void TEnc3DAsymLUT::create( Int nMaxOctantDepth, Int nInputBitDepth, Int nInputBitDepthC, Int nOutputBitDepth, Int nOutputBitDepthC, Int nMaxYPartNumLog2 )
    9393{
    9494  if( m_pColorInfo != NULL )
    … …  
    9797  }
    9898
    99   TCom3DAsymLUT::create( nMaxOctantDepth , nInputBitDepth , nInputBitDepthC, nOutputBitDepth , nOutputBitDepthC, nMaxYPartNumLog2, 1 << ( nInputBitDepthC - 1 ) , 1 << ( nInputBitDepthC - 1 ) );
     99  TCom3DAsymLUT::create( nMaxOctantDepth, nInputBitDepth, nInputBitDepthC, nOutputBitDepth, nOutputBitDepthC, nMaxYPartNumLog2, 1 << ( nInputBitDepthC - 1 ), 1 << ( nInputBitDepthC - 1 ) );
    100100
    101101  xAllocate3DArray( m_pColorInfo , xGetYSize() , xGetUSize() , xGetVSize() );
    … …  
    138138}
    139139
    140 Double TEnc3DAsymLUT::xDeriveVertexPerColor( Double N , Double Ys , Double Yy , Double Yu , Double Yv , Double ys , Double us , Double vs , Double yy , Double yu , Double yv , Double uu , Double uv , Double vv , Double YY ,
    141   Pel & rP0 , Pel & rP1 , Pel & rP3 , Pel & rP7 , Int nResQuantBit )
     140Double TEnc3DAsymLUT::xDeriveVertexPerColor( Double N, Double Ys, Double Yy, Double Yu, Double Yv, Double ys, Double us, Double vs, Double yy, Double yu, Double yv, Double uu, Double uv, Double vv, Double YY,
     141                                             Pel & rP0, Pel & rP1, Pel & rP3, Pel & rP7, Int nResQuantBit )
    142142{
    143143  Int nInitP0 = rP0;
    … …  
    200200}
    201201
    202 Double TEnc3DAsymLUT::estimateDistWithCur3DAsymLUT( TComPic * pCurPic , UInt refLayerIdc )
     202Double TEnc3DAsymLUT::estimateDistWithCur3DAsymLUT( TComPic * pCurPic, UInt refLayerIdc )
    203203{
    204204  xCollectData( pCurPic , refLayerIdc );
    … …  
    236236
    237237#if R0179_ENC_OPT_3DLUT_SIZE
    238 Double TEnc3DAsymLUT::derive3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS , Bool bElRapSliceTypeB, Double dFrameLambda )
     238Double TEnc3DAsymLUT::derive3DAsymLUT( TComSlice * pSlice, TComPic * pCurPic, UInt refLayerIdc, TEncCfg * pCfg, Bool bSignalPPS, Bool bElRapSliceTypeB, Double dFrameLambda )
    239239{
    240240  m_nLUTBitDepth = pCfg->getCGSLUTBit();
    … …  
    355355
    356356  // check res_quant_bits only for the best table size and best U/V threshold
    357   if( !bUseNewColorInfo )
     357  if( !bUseNewColorInfo )
     358  {
    358359    xConsolidateData( &m_sLutSizes[iBestLUTSizeIdx], &sMaxLutSize );
     360  }
    359361
    360362  //    xCollectData( pCurPic , refLayerIdc );
    … …  
    403405#endif
    404406
    405 Double TEnc3DAsymLUT::derive3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS , Bool bElRapSliceTypeB )
     407Double TEnc3DAsymLUT::derive3DAsymLUT( TComSlice * pSlice, TComPic * pCurPic, UInt refLayerIdc, TEncCfg * pCfg, Bool bSignalPPS, Bool bElRapSliceTypeB )
    406408{
    407409  m_nLUTBitDepth = pCfg->getCGSLUTBit();
    … …  
    459461
    460462  setResQuantBit( nBestResQuanBit );
    461   xUpdatePartitioning( nBestOctantDepth , nBestYPartNumLog2 , nBestAdaptCThresholdU , nBestAdaptCThresholdV );
     463  xUpdatePartitioning( nBestOctantDepth, nBestYPartNumLog2, nBestAdaptCThresholdU, nBestAdaptCThresholdV );
    462464
    463465  xSaveCuboids( m_pBestEncCuboid );
    … …  
    465467}
    466468
    467 Double TEnc3DAsymLUT::xDeriveVertexes( Int nResQuanBit , SCuboid *** pCurCuboid )
     469Double TEnc3DAsymLUT::xDeriveVertexes( Int nResQuanBit, SCuboid *** pCurCuboid )
    468470{
    469471  Double dErrorLuma = 0 , dErrorChroma = 0;
    … …  
    519521}
    520522
    521 Void TEnc3DAsymLUT::xCollectData( TComPic * pCurPic , UInt refLayerIdc )
     523Void TEnc3DAsymLUT::xCollectData( TComPic * pCurPic, UInt refLayerIdc )
    522524{
    523525  Pel * pSrcY = m_pDsOrigPic->getAddr(COMPONENT_Y);
    … …  
    659661}
    660662
    661 Void TEnc3DAsymLUT::xDerivePartNumLog2( TComSlice * pSlice , TEncCfg * pcCfg , Int & rOctantDepth , Int & rYPartNumLog2 , Bool bSignalPPS , Bool bElRapSliceTypeB )
     663Void TEnc3DAsymLUT::xDerivePartNumLog2( TComSlice * pSlice, TEncCfg * pcCfg, Int & rOctantDepth, Int & rYPartNumLog2, Bool bSignalPPS, Bool bElRapSliceTypeB )
    662664{
    663665  Int nPartNumLog2 = 4;
    … …  
    687689}
    688690
    689 Void TEnc3DAsymLUT::xMapPartNum2DepthYPart( Int nPartNumLog2 , Int & rOctantDepth , Int & rYPartNumLog2 )
     691Void TEnc3DAsymLUT::xMapPartNum2DepthYPart( Int nPartNumLog2, Int & rOctantDepth, Int & rYPartNumLog2 )
    690692{
    691693  for( Int y = getMaxYPartNumLog2() ; y >= 0 ; y-- )
    … …  
    705707}
    706708
    707 Void TEnc3DAsymLUT::updatePicCGSBits( TComSlice * pcSlice , Int nPPSBit )
     709Void TEnc3DAsymLUT::updatePicCGSBits( TComSlice * pcSlice, Int nPPSBit )
    708710{
    709711  for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ )
    … …  
    735737  Int iNumELFrameBits = m_nPrevELFrameBit[pSlice->getSliceType()][pSlice->getDepth()];
    736738
    737   xMapPartNum2DepthYPart( xGetMaxPartNumLog2() , iMaxCPartNumLog2 , iMaxYPartNumLog2 );
     739  xMapPartNum2DepthYPart( xGetMaxPartNumLog2(), iMaxCPartNumLog2, iMaxYPartNumLog2 );
    738740  iMaxAddYPartNumLog2 = iMaxYPartNumLog2;
    739741  iMaxYPartNumLog2 += iMaxCPartNumLog2;
    … …  
    762764}
    763765
    764 Void TEnc3DAsymLUT::xCopyColorInfo( SColorInfo *** dst, SColorInfo *** src ,  SColorInfo *** dstC, SColorInfo *** srcC )
     766Void TEnc3DAsymLUT::xCopyColorInfo( SColorInfo *** dst, SColorInfo *** src,  SColorInfo *** dstC, SColorInfo *** srcC )
    765767{
    766768  Int yIdx, uIdx, vIdx;
    … …  
    815817  }
    816818
    817   xReset3DArray( m_pColorInfo  ,  1<<pMaxLUTSize->iYPartNumLog2, 1<<pMaxLUTSize->iCPartNumLog2, 1<<pMaxLUTSize->iCPartNumLog2 );
    818   xReset3DArray( m_pColorInfoC ,  1<<pMaxLUTSize->iYPartNumLog2, 1<<pMaxLUTSize->iCPartNumLog2, 1<<pMaxLUTSize->iCPartNumLog2 );
     819  xReset3DArray( m_pColorInfo,   1<<pMaxLUTSize->iYPartNumLog2, 1<<pMaxLUTSize->iCPartNumLog2, 1<<pMaxLUTSize->iCPartNumLog2 );
     820  xReset3DArray( m_pColorInfoC,  1<<pMaxLUTSize->iYPartNumLog2, 1<<pMaxLUTSize->iCPartNumLog2, 1<<pMaxLUTSize->iCPartNumLog2 );
    819821
    820822  for(yIdx = 0; yIdx < nYSize; yIdx++)

  • branches/SHM-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.h

    r1432 r1440  
    111111  virtual ~TEnc3DAsymLUT();
    112112
    113   virtual Void  create( Int nMaxOctantDepth , Int nInputBitDepth , Int nInputBitDepthC , Int nOutputBitDepth , Int nOutputBitDepthC , Int nMaxYPartNumLog2 );
    114   virtual Void  destroy();
    115   Double derive3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS , Bool bElRapSliceTypeB );
     113  Void create( Int nMaxOctantDepth, Int nInputBitDepth, Int nInputBitDepthC, Int nOutputBitDepth, Int nOutputBitDepthC, Int nMaxYPartNumLog2 );
     114  virtual Void destroy();
     115  Double derive3DAsymLUT( TComSlice * pSlice, TComPic * pCurPic, UInt refLayerIdc, TEncCfg * pCfg, Bool bSignalPPS, Bool bElRapSliceTypeB );
    116116  Double estimateDistWithCur3DAsymLUT( TComPic * pCurPic , UInt refLayerIdc );
    117117#if R0179_ENC_OPT_3DLUT_SIZE
Note: See TracChangeset for help on using the changeset viewer.