Changeset 321 in SHVCSoftware for branches/SHM-3.0-dev/source/Lib/TLibEncoder


Ignore:
Timestamp:
2 Aug 2013, 22:52:20 (12 years ago)
Author:
seregin
Message:

remove INTRA_BL

Location:
branches/SHM-3.0-dev/source/Lib/TLibEncoder
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r313 r321  
    17261726  return true;
    17271727}
    1728 
    1729 #if INTRA_BL
    1730 Void TEncCavlc::codeIntraBLFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
    1731 {
    1732   assert(0);
    1733 }
    1734 
    1735 #endif
    17361728//! \}

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncCavlc.h

    r313 r321  
    112112  Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    113113  Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    114 #if INTRA_BL
    115   Void codeIntraBLFlag   ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    116 #endif
    117114 
    118115  Void codeInterModeFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiEncMode );

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncCu.cpp

    r319 r321  
    763763          }
    764764        }
    765 #if INTRA_BL
    766       if(m_pcPicYuvRecBase)
    767       {
    768         xCheckRDCostIntraBL( rpcBestCU, rpcTempCU );
    769         rpcTempCU->initEstData( uiDepth, iQP );
    770       }
    771 #endif
    772765#if (ENCODER_FAST_MODE)
    773766      if(pcPic->getLayerId() > 0)
    … …  
    12151208    return;
    12161209  }
    1217 #if INTRA_BL
    1218   m_pcEntropyCoder->encodeIntraBLFlag( pcCU, uiAbsPartIdx );
    1219   if ( !pcCU->isIntraBL( uiAbsPartIdx ) )
    1220   {
    1221 #endif
    12221210  m_pcEntropyCoder->encodePredMode( pcCU, uiAbsPartIdx );
    12231211 
    … …  
    12381226  // prediction Info ( Intra : direction mode, Inter : Mv, reference idx )
    12391227  m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx );
    1240 #if INTRA_BL
    1241   }
    1242 #endif
    12431228 
    12441229  // Encode Coefficients
    … …  
    15681553 
    15691554  m_pcEntropyCoder->resetBits();
    1570 #if INTRA_BL
    1571   m_pcEntropyCoder->encodeIntraBLFlag ( rpcTempCU, 0,       true );
    1572 #endif
     1555
    15731556  if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnableFlag())
    15741557  {
    … …  
    16241607
    16251608  m_pcEntropyCoder->resetBits();
    1626 #if INTRA_BL
    1627   m_pcEntropyCoder->encodeIntraBLFlag ( rpcTempCU, 0,       true );
    1628 #endif
     1609
    16291610  if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnableFlag())
    16301611  {
    … …  
    18791860#endif
    18801861
    1881 #if INTRA_BL
    1882 Void TEncCu::xCheckRDCostIntraBL( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU )
    1883 {
    1884   UInt uiDepth = rpcTempCU->getDepth( 0 );
    1885   rpcTempCU->setSkipFlagSubParts( false, 0, uiDepth );
    1886   rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );
    1887   rpcTempCU->setPredModeSubParts( MODE_INTRA_BL, 0, uiDepth ); 
    1888   rpcTempCU->setCUTransquantBypassSubParts( m_pcEncCfg->getCUTransquantBypassFlagValue(), 0, uiDepth );
    1889 
    1890   m_pcPredSearch->setBaseRecPic( m_pcPicYuvRecBase );
    1891   m_pcPredSearch->estIntraBLPredQT( rpcTempCU, m_ppcOrigYuv[uiDepth], m_ppcPredYuvTemp[uiDepth], m_ppcResiYuvTemp[uiDepth], m_ppcRecoYuvTemp[uiDepth] );
    1892 
    1893   m_pcEntropyCoder->resetBits();
    1894   m_pcEntropyCoder->encodeIntraBLFlag ( rpcTempCU, 0,       true );
    1895   m_pcEntropyCoder->encodeSkipFlag( rpcTempCU, 0,       true );
    1896   if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnableFlag())
    1897   {
    1898     m_pcEntropyCoder->encodeCUTransquantBypassFlag( rpcTempCU, 0,          true );
    1899   }
    1900 
    1901   // Encode Coefficients
    1902   Bool bCodeDQP = getdQPFlag();
    1903   m_pcEntropyCoder->encodeCoeff( rpcTempCU, 0, uiDepth, rpcTempCU->getWidth (0), rpcTempCU->getHeight(0), bCodeDQP );
    1904   setdQPFlag( bCodeDQP );
    1905  
    1906   if( m_bUseSBACRD ) m_pcRDGoOnSbacCoder->store(m_pppcRDSbacCoder[uiDepth][CI_TEMP_BEST]);
    1907  
    1908   rpcTempCU->getTotalBits() = m_pcEntropyCoder->getNumberOfWrittenBits();
    1909   if(m_pcEncCfg->getUseSBACRD())
    1910   {
    1911     rpcTempCU->getTotalBins() = ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
    1912   }
    1913   rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
    1914  
    1915   xCheckDQP( rpcTempCU );
    1916   xCheckBestMode(rpcBestCU, rpcTempCU, uiDepth);
    1917 }
    1918 #endif
    19191862#if (ENCODER_FAST_MODE)
    19201863Void TEncCu::xCheckRDCostILRUni(TComDataCU *&rpcBestCU, TComDataCU *&rpcTempCU, UInt refLayerId)

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncCu.h

    r313 r321  
    8484  //  Access channel
    8585  TEncCfg*                m_pcEncCfg;
    86 #if INTRA_BL
    87   TComPicYuv*             m_pcPicYuvRecBase;       ///< reconstructed base layer
    88 #endif
    8986  TEncSearch*             m_pcPredSearch;
    9087  TComTrQuant*            m_pcTrQuant;
    … …  
    134131  Int   updateLCUDataISlice ( TComDataCU* pcCU, Int LCUIdx, Int width, Int height );
    135132#endif
    136 #if INTRA_BL
    137   Void  setBaseRecPic       ( TComPicYuv* p ) { m_pcPicYuvRecBase = p; }   
    138 #endif
     133
    139134protected:
    140135  Void  finishCU            ( TComDataCU*  pcCU, UInt uiAbsPartIdx,           UInt uiDepth        );
    … …  
    157152#endif
    158153  Void  xCheckRDCostIntra   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize  );
    159 #if INTRA_BL
    160   Void  xCheckRDCostIntraBL ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU  );
    161 #endif
    162154#if ENCODER_FAST_MODE
    163155  Void  xCheckRDCostILRUni  ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt refLayerId);

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncEntropy.cpp

    r319 r321  
    166166  }
    167167
    168 #if INTRA_BL
    169   if( pcCU->isIntraBL( uiAbsPartIdx ) )
    170   {
    171     return;
    172   }
    173 #endif
    174 
    175168  m_pcEntropyCoderIf->codePredMode( pcCU, uiAbsPartIdx );
    176169}
    … …  
    251244    }
    252245  }
    253 #if INTRA_BL
    254     if( pcCU->isIntra(uiAbsPartIdx) && pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_NxN && uiDepth == pcCU->getDepth(uiAbsPartIdx) )
    255 #else
    256246 
    257247  if( pcCU->getPredictionMode(uiAbsPartIdx) == MODE_INTRA && pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_NxN && uiDepth == pcCU->getDepth(uiAbsPartIdx) )
    258 #endif
    259248  {
    260249    assert( uiSubdiv );
    … …  
    342331    }
    343332   
    344 #if INTRA_BL
    345     if( ( !pcCU->isIntra( uiAbsPartIdx ) ) && uiDepth == pcCU->getDepth( uiAbsPartIdx ) && !pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, 0 ) && !pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, 0 ) )
    346 #else
    347333    if( pcCU->getPredictionMode(uiAbsPartIdx) != MODE_INTRA && uiDepth == pcCU->getDepth( uiAbsPartIdx ) && !pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, 0 ) && !pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, 0 ) )
    348 #endif
    349334    {
    350335      assert( pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, 0 ) );
    … …  
    427412Void TEncEntropy::encodePredInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    428413{
    429 #if INTRA_BL
    430   assert ( !pcCU->isIntraBL( uiAbsPartIdx ) );
    431 #endif
    432414  if( bRD )
    433415  {
    … …  
    751733}
    752734
    753 #if INTRA_BL
    754 Void TEncEntropy::encodeIntraBLFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    755 {
    756   if( pcCU->getLayerId() == 0 )
    757   {
    758     return;
    759   }
    760 
    761   if( bRD )
    762   {
    763     uiAbsPartIdx = 0;
    764   }
    765   m_pcEntropyCoderIf->codeIntraBLFlag( pcCU, uiAbsPartIdx );
    766 }
    767 #endif
    768735//! \}

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncEntropy.h

    r313 r321  
    8585  virtual Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    8686  virtual Void codeSplitFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    87  
    88 #if INTRA_BL
    89   virtual Void codeIntraBLFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    90 #endif
     87
    9188  virtual Void codePartSize      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9289  virtual Void codePredMode      ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    … …  
    164161  Void encodeMergeFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    165162  Void encodeMergeIndex   ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
    166 #if INTRA_BL
    167   Void encodeIntraBLFlag  ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
    168 #endif
    169163  Void encodePredMode          ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
    170164  Void encodePartSize          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool bRD = false );

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncSbac.cpp

    r313 r321  
    8383, m_cTransformSkipSCModel     ( 1,             2,               NUM_TRANSFORMSKIP_FLAG_CTX    , m_contextModels + m_numContextModels, m_numContextModels)
    8484, m_CUTransquantBypassFlagSCModel( 1,          1,               NUM_CU_TRANSQUANT_BYPASS_FLAG_CTX, m_contextModels + m_numContextModels, m_numContextModels)
    85 #if INTRA_BL
    86 , m_cIntraBLPredFlagSCModel   (1,              1,               NUM_INTRA_BL_PRED_CTX         , m_contextModels + m_numContextModels, m_numContextModels)
    87 #endif
    8885{
    8986  assert( m_numContextModels <= MAX_NUM_CTX_MOD );
    … …  
    134131  m_cCUTransSubdivFlagSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_TRANS_SUBDIV_FLAG );
    135132  m_cSaoMergeSCModel.initBuffer      ( eSliceType, iQp, (UChar*)INIT_SAO_MERGE_FLAG );
    136 #if INTRA_BL
    137   m_cIntraBLPredFlagSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_INTRA_BL_PRED_FLAG );
    138 #endif
    139133  m_cSaoTypeIdxSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SAO_TYPE_IDX );
    140134  m_cTransformSkipSCModel.initBuffer     ( eSliceType, iQp, (UChar*)INIT_TRANSFORMSKIP_FLAG );
    … …  
    169163      curCost  = m_cCUSplitFlagSCModel.calcCost       ( curSliceType, qp, (UChar*)INIT_SPLIT_FLAG );
    170164      curCost += m_cCUSkipFlagSCModel.calcCost        ( curSliceType, qp, (UChar*)INIT_SKIP_FLAG );
    171 #if INTRA_BL
    172       curCost += m_cIntraBLPredFlagSCModel.calcCost   ( curSliceType, qp, (UChar*)INIT_INTRA_BL_PRED_FLAG );
    173 #endif
    174165      curCost += m_cCUMergeFlagExtSCModel.calcCost    ( curSliceType, qp, (UChar*)INIT_MERGE_FLAG_EXT);
    175166      curCost += m_cCUMergeIdxExtSCModel.calcCost     ( curSliceType, qp, (UChar*)INIT_MERGE_IDX_EXT);
    … …  
    243234  m_cCUTransSubdivFlagSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_TRANS_SUBDIV_FLAG );
    244235  m_cSaoMergeSCModel.initBuffer      ( eSliceType, iQp, (UChar*)INIT_SAO_MERGE_FLAG );
    245 #if INTRA_BL
    246   m_cIntraBLPredFlagSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_INTRA_BL_PRED_FLAG );
    247 #endif
    248236  m_cSaoTypeIdxSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SAO_TYPE_IDX );
    249237  m_cTransformSkipSCModel.initBuffer     ( eSliceType, iQp, (UChar*)INIT_TRANSFORMSKIP_FLAG );
    … …  
    428416{
    429417  PartSize eSize         = pcCU->getPartitionSize( uiAbsPartIdx );
    430 #if INTRA_BL
    431   assert( !pcCU->isIntraBL( uiAbsPartIdx ) );
    432 #endif
     418
    433419  if ( pcCU->isIntra( uiAbsPartIdx ) )
    434420  {
    … …  
    16001586}
    16011587
    1602 #if INTRA_BL
    1603 /** code intra_bl flag
    1604  * \param pcCU
    1605  * \param uiAbsPartIdx
    1606  * \returns Void
    1607  */
    1608 Void TEncSbac::codeIntraBLFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
    1609 {
    1610   // get context function is here
    1611   UInt uiSymbol = pcCU->isIntraBL( uiAbsPartIdx ) ? 1 : 0;
    1612 
    1613   UInt uiCtxIntraBL = pcCU->getCtxIntraBLFlag( uiAbsPartIdx ) ;
    1614   m_pcBinIf->encodeBin(uiSymbol, m_cIntraBLPredFlagSCModel.get( 0, 0, uiCtxIntraBL ));
    1615 
    1616   DTRACE_CABAC_VL( g_nSymbolCounter++ );
    1617   DTRACE_CABAC_T( "\tuiSymbol: ");
    1618   DTRACE_CABAC_V( uiSymbol );
    1619   DTRACE_CABAC_T( "\n");
    1620 }
    1621 #endif
    16221588//! \}

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncSbac.h

    r313 r321  
    132132  Void codeSplitFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    133133  Void codeMVPIdx        ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList );
    134  
    135 #if INTRA_BL
    136   Void codeIntraBLFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    137 #endif
     134
    138135  Void codePartSize      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    139136  Void codePredMode      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    … …  
    206203  ContextModel3DBuffer m_cTransformSkipSCModel;
    207204  ContextModel3DBuffer m_CUTransquantBypassFlagSCModel;
    208 #if INTRA_BL
    209   ContextModel3DBuffer m_cIntraBLPredFlagSCModel;
    210 #endif
    211205};
    212206

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

    r319 r321  
    906906        m_pcEntropyCoder->encodePredMode( pcCU, 0, true );
    907907      }
    908 #if INTRA_BL
    909       m_pcEntropyCoder->encodeIntraBLFlag ( pcCU, 0, true );
    910       if( pcCU->isIntraBL( 0 ) )
    911       {
    912         return;
    913       }
    914 #endif     
     908   
    915909      m_pcEntropyCoder  ->encodePartSize( pcCU, 0, pcCU->getDepth(0), true );
    916910
    … …  
    950944    }
    951945  }
    952 #if INTRA_BL
    953   if( pcCU->isIntraBL( 0 ) )
    954   {
    955     return;
    956   }
    957 #endif
     946
    958947  if( bChroma )
    959948  {
    … …  
    10551044    pcCU->getPattern()->initAdiPattern( pcCU, uiAbsPartIdx, uiTrDepth, m_piYuvExt, m_iYuvExtStride, m_iYuvExtHeight, bAboveAvail, bLeftAvail );
    10561045    //===== get prediction signal =====
    1057 #if INTRA_BL
    1058     if(pcCU->isIntraBL ( uiAbsPartIdx ) )
    1059     {
    1060       pcCU->getBaseLumaBlk( uiWidth, uiHeight, uiAbsPartIdx, piPred, uiStride );
    1061     }
    1062     else
    1063 #endif
    10641046    predIntraLumaAng( pcCU->getPattern(), uiLumaPredMode, piPred, uiStride, uiWidth, uiHeight, bAboveAvail, bLeftAvail );
    10651047    // save prediction
    … …  
    12471229
    12481230    //===== get prediction signal =====
    1249 #if INTRA_BL
    1250   if(pcCU->isIntraBL ( uiAbsPartIdx ) )
    1251   {
    1252     pcCU->getBaseChromaBlk( uiWidth, uiHeight, uiAbsPartIdx, piPred, uiStride, uiChromaId );
    1253   }
    1254   else
    1255 #endif
    1256     {
    1257       predIntraChromaAng( pPatChroma, uiChromaPredMode, piPred, uiStride, uiWidth, uiHeight, bAboveAvail, bLeftAvail );
    1258     }
     1231    predIntraChromaAng( pPatChroma, uiChromaPredMode, piPred, uiStride, uiWidth, uiHeight, bAboveAvail, bLeftAvail );
     1232
    12591233    // save prediction
    12601234    if( default0Save1Load2 == 1 )
    … …  
    55765550
    55775551  {
    5578 #if INTRA_BL
    5579     assert( !pcCU->isIntra(uiAbsPartIdx) );
    5580 #else
    55815552    assert( pcCU->getPredictionMode(uiAbsPartIdx) != MODE_INTRA );
    5582 #endif
    55835553    if( bSubdivAndCbf )
    55845554    {
    … …  
    58145784    }
    58155785    m_pcEntropyCoder->encodeSkipFlag ( pcCU, 0, true );
    5816 #if INTRA_BL
    5817     if(m_pcEncCfg->getLayerId())
    5818     {
    5819       m_pcEntropyCoder->encodeIntraBLFlag(pcCU, 0, true);
    5820       assert( pcCU->isIntraBL( 0 ) == false );
    5821     }
    5822 #endif
    58235786    m_pcEntropyCoder->encodePredMode( pcCU, 0, true );
    58245787    m_pcEntropyCoder->encodePartSize( pcCU, 0, pcCU->getDepth(0), true );
    … …  
    62426205#endif
    62436206
    6244 #if INTRA_BL
    6245 Void
    6246 TEncSearch::estIntraBLPredQT( TComDataCU* pcCU,
    6247                            TComYuv*    pcOrgYuv,
    6248                            TComYuv*    pcPredYuv,
    6249                            TComYuv*    pcResiYuv,
    6250                            TComYuv*    pcRecoYuv )
    6251 {
    6252   UInt    uiDepth        = pcCU->getDepth(0);
    6253   UInt    uiOverallDistY = 0;
    6254   UInt    uiOverallDistC = 0;
    6255  
    6256   //===== set QP and clear Cbf =====
    6257   if ( pcCU->getSlice()->getPPS()->getUseDQP() == true)
    6258   {
    6259     pcCU->setQPSubParts( pcCU->getQP(0), 0, uiDepth );
    6260   }
    6261   else
    6262   {
    6263     pcCU->setQPSubParts( pcCU->getSlice()->getSliceQp(), 0, uiDepth );
    6264   }
    6265  
    6266   //===== init pattern for luma prediction =====
    6267   Bool bAboveAvail = false;
    6268   Bool bLeftAvail  = false;
    6269   pcCU->getPattern()->initPattern   ( pcCU, 0, 0 );
    6270   pcCU->getPattern()->initAdiPattern( pcCU, 0, 0, m_piYuvExt, m_iYuvExtStride, m_iYuvExtHeight, bAboveAvail, bLeftAvail );
    6271  
    6272   pcCU->setLumaIntraDirSubParts ( DC_IDX, 0, uiDepth );
    6273  
    6274   // set context models
    6275   if( m_bUseSBACRD )
    6276   {
    6277     m_pcRDGoOnSbacCoder->load( m_pppcRDSbacCoder[uiDepth][CI_CURR_BEST] );
    6278   }
    6279  
    6280   // determine residual for partition
    6281   Double dPUCost   = 0.0;
    6282   xRecurIntraCodingQT( pcCU, 0, 0, false, pcOrgYuv, pcPredYuv, pcResiYuv, uiOverallDistY, uiOverallDistC, false, dPUCost );
    6283   xSetIntraResultQT( pcCU, 0, 0, false, pcRecoYuv );
    6284  
    6285   //=== update PU data ====
    6286   pcCU->copyToPic( uiDepth, 0, 0 );
    6287    
    6288   //===== reset context models =====
    6289   if(m_bUseSBACRD)
    6290   {
    6291     m_pcRDGoOnSbacCoder->load(m_pppcRDSbacCoder[uiDepth][CI_CURR_BEST]);
    6292   }
    6293 
    6294   //===== set distortion (rate and r-d costs are determined later) =====
    6295   pcCU->getTotalDistortion() = uiOverallDistY + uiOverallDistC;
    6296 }
    6297 
    6298 #endif
    62996207//! \}

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncSearch.h

    r313 r321  
    9999#if SVC_EXTENSION
    100100  TEncTop**       m_ppcTEncTop;
    101 #if INTRA_BL
    102   TComPicYuv*     m_pcPicYuvRecBase;       ///< reconstructed base layer
    103 #endif
    104101#endif
    105102 
    … …  
    192189                                  TComYuv*    pcRecoYuv,
    193190                                  UInt        uiPreCalcDistC );
    194  
    195 #if INTRA_BL
    196   Void setBaseRecPic            ( TComPicYuv* pcPicYuvRecBase ) { m_pcPicYuvRecBase = pcPicYuvRecBase; } 
    197   TComPicYuv* getBaseRecPic     ()                              { return m_pcPicYuvRecBase; }
    198   Void  estIntraBLPredQT        ( TComDataCU* pcCU,
    199                                   TComYuv*    pcOrgYuv,
    200                                   TComYuv*    pcPredYuv,
    201                                   TComYuv*    pcResiYuv,
    202                                   TComYuv*    pcRecoYuv );
    203 #endif
    204191 
    205192  /// encoder estimation - inter prediction (non-skip)

  • branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncSlice.cpp

    r314 r321  
    980980  UInt uiTileLCUX     = 0;
    981981
    982 #if INTRA_BL
    983   m_pcCuEncoder->setBaseRecPic( rpcPic->getLayerId() > 0 ? rpcPic->getFullPelBaseRec(rpcPic->getLayerId()-1) : NULL);
    984 #endif
    985 
    986982  Bool depSliceSegmentsEnabled = pcSlice->getPPS()->getDependentSliceSegmentsEnabledFlag();
    987983  uiCUAddr = rpcPic->getPicSym()->getCUOrderMap( uiStartCUAddr /rpcPic->getNumPartInCU());
Note: See TracChangeset for help on using the changeset viewer.