Ignore:
Timestamp:
22 May 2013, 21:05:43 (11 years ago)
Author:
tech
Message:

Merged HTM-6.2-dev3-RWTH-Fix Rev. 415

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev0/source/Lib/TLibEncoder/TEncEntropy.cpp

    r427 r433  
    877877  }
    878878#endif
     879#endif
    879880}
    880881
     
    917918    }
    918919  }
     920#if !PKU_QC_DEPTH_INTRA_UNI_D0195
    919921#if RWTH_SDC_DLT_B0036
    920922  if( !pcCU->getSlice()->isInterB() && pcCU->isIntra(uiAbsPartIdx) && pcCU->getSDCFlag(uiAbsPartIdx)  )
     
    924926  }
    925927#endif
     928#endif
    926929 
    927930  m_pcEntropyCoderIf->codePartSize( pcCU, uiAbsPartIdx, uiDepth );
    928931 
     932#if !PKU_QC_DEPTH_INTRA_UNI_D0195
    929933#if RWTH_SDC_DLT_B0036
    930934  // code SDC flag now!
     
    940944    }
    941945  }
     946#endif
    942947#endif
    943948}
     
    12201225
    12211226// Intra direction for Luma
    1222 Void TEncEntropy::encodeIntraDirModeLuma  ( TComDataCU* pcCU, UInt uiAbsPartIdx )
    1223 {
    1224   m_pcEntropyCoderIf->codeIntraDirLumaAng( pcCU, uiAbsPartIdx );
     1227Void TEncEntropy::encodeIntraDirModeLuma  ( TComDataCU* pcCU, UInt uiAbsPartIdx
     1228#if PKU_QC_DEPTH_INTRA_UNI_D0195
     1229                                           ,Bool bSdcRD
     1230#endif
     1231                                           )
     1232{
     1233  m_pcEntropyCoderIf->codeIntraDirLumaAng( pcCU, uiAbsPartIdx
     1234#if PKU_QC_DEPTH_INTRA_UNI_D0195
     1235    ,bSdcRD
     1236#endif
     1237    );
    12251238}
    12261239
     
    12361249}
    12371250
    1238 Void TEncEntropy::encodePredInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
     1251Void TEncEntropy::encodePredInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD
     1252#if PKU_QC_DEPTH_INTRA_UNI_D0195
     1253                                 ,Bool bSdcRD
     1254#endif
     1255                                 )
    12391256{
    12401257  if( bRD )
     
    12431260  }
    12441261
     1262#if !PKU_QC_DEPTH_INTRA_UNI_D0195
    12451263#if RWTH_SDC_DLT_B0036
    12461264  if( pcCU->getSDCFlag(uiAbsPartIdx) )
     
    12491267    return;
    12501268  }
     1269#endif
    12511270#endif
    12521271
     
    12631282      encodeIntraDirModeLuma( pcCU, uiAbsPartIdx + uiPartOffset*2 );
    12641283      encodeIntraDirModeLuma( pcCU, uiAbsPartIdx + uiPartOffset*3 );
     1284#if PKU_QC_DEPTH_INTRA_UNI_D0195
     1285      if(!pcCU->getSDCFlag(uiAbsPartIdx))
     1286#endif
    12651287      encodeIntraDirModeChroma( pcCU, uiAbsPartIdx, bRD );
    12661288    }
    12671289    else                                                              // if it is not NxN size, encode 1 intra directions
    12681290    {
    1269       encodeIntraDirModeLuma  ( pcCU, uiAbsPartIdx );
     1291      encodeIntraDirModeLuma  ( pcCU, uiAbsPartIdx
    12701292      encodeIntraDirModeChroma( pcCU, uiAbsPartIdx, bRD );
    12711293    }
     
    14651487    assert( pcCU->getCbf(uiAbsPartIdx, TEXT_CHROMA_U) == 1 );
    14661488    assert( pcCU->getCbf(uiAbsPartIdx, TEXT_CHROMA_V) == 1 );
    1467    
    14681489    encodeSDCResidualData(pcCU, uiAbsPartIdx);
     1490#endif
    14691491    return;
    14701492  }
     
    18621884
    18631885#if RWTH_SDC_DLT_B0036
     1886#if !PKU_QC_DEPTH_INTRA_UNI_D0195
    18641887Void TEncEntropy::encodeSDCPredMode( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    18651888{
     
    18811904  m_pcEntropyCoderIf->codeSDCFlag(pcCU, uiAbsPartIdx);
    18821905}
    1883 
    18841906Void TEncEntropy::encodeSDCResidualData( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    18851907{
Note: See TracChangeset for help on using the changeset viewer.