Ignore:
Timestamp:
29 Jul 2015, 12:04:32 (9 years ago)
Author:
tech
Message:

Merged 14.1-update-dev1-LG@1303.

Location:
branches/HTM-14.1-update-dev1
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-14.1-update-dev1

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1287 r1304  
    33743374}
    33753375#endif
    3376 #if NH_3D_SDC_INTRA || H_3D_INTER_SDC
     3376#if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    33773377Void TDecCavlc::parseSDCFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    33783378{

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCAVLC.h

    r1279 r1304  
    123123  Void  parseICFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    124124#endif
    125 #if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
     125#if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    126126  Void  parseDeltaDC        ( TComDataCU* /*pcCU*/, UInt /*absPartIdx*/, UInt /*depth*/ ) { assert(0); };
    127127#endif
    128 #if NH_3D_SDC_INTRA || H_3D_INTER_SDC
     128#if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    129129  Void  parseSDCFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    130130#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCu.cpp

    r1288 r1304  
    656656    {
    657657#endif
    658 #if H_3D_INTER_SDC
     658#if NH_3D_SDC_INTER
    659659      if( m_ppcCU[uiDepth]->getSDCFlag( 0 ) )
    660660      {
    … …  
    665665#endif
    666666      xReconInter( m_ppcCU[uiDepth], uiDepth );
    667 #if H_3D_INTER_SDC
     667#if NH_3D_SDC_INTER
    668668      }
    669669#endif
    … …  
    836836}
    837837#endif
    838 #if H_3D_INTER_SDC
     838#if NH_3D_SDC_INTER
    839839Void TDecCu::xReconInterSDC( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    840840{
    … …  
    847847  Pel  *pResi;
    848848  UInt uiPelX, uiPelY;
    849   UInt uiResiStride = m_ppcYuvResi[uiDepth]->getStride();
    850 
    851   pResi = m_ppcYuvResi[uiDepth]->getLumaAddr( 0 );
     849  UInt uiResiStride = m_ppcYuvResi[uiDepth]->getStride( COMPONENT_Y );
     850  Int  bitDepthC = pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_CHROMA);
     851
     852  pResi = m_ppcYuvResi[uiDepth]->getAddr( COMPONENT_Y );
    852853  for( uiPelY = 0; uiPelY < uiHeight; uiPelY++ )
    853854  {
    … …  
    859860  }
    860861
    861   m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ) );
     862  m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ), pcCU->getSlice()->getSPS()->getBitDepths() );
    862863
    863864  // clear UV
    864   UInt  uiStrideC     = m_ppcYuvReco[uiDepth]->getCStride();
    865   Pel   *pRecCb       = m_ppcYuvReco[uiDepth]->getCbAddr();
    866   Pel   *pRecCr       = m_ppcYuvReco[uiDepth]->getCrAddr();
     865  UInt  uiStrideC     = m_ppcYuvReco[uiDepth]->getStride( COMPONENT_Cb );
     866  Pel   *pRecCb       = m_ppcYuvReco[uiDepth]->getAddr( COMPONENT_Cb );
     867  Pel   *pRecCr       = m_ppcYuvReco[uiDepth]->getAddr( COMPONENT_Cr );
    867868
    868869  for (Int y = 0; y < uiHeight/2; y++)
    … …  
    870871    for (Int x = 0; x < uiWidth/2; x++)
    871872    {
    872       pRecCb[x] = (Pel)( 1 << ( g_bitDepthC - 1 ) );
    873       pRecCr[x] = (Pel)( 1 << ( g_bitDepthC - 1 ) );
     873      pRecCb[x] = (Pel)( 1 << ( bitDepthC - 1 ) );
     874      pRecCr[x] = (Pel)( 1 << ( bitDepthC - 1 ) );
    874875    }
    875876

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCu.h

    r1279 r1304  
    130130  Void xReconIntraSDC           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    131131#endif
    132 #if H_3D_INTER_SDC
     132#if NH_3D_SDC_INTER
    133133  Void xReconInterSDC           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    134134#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecEntropy.cpp

    r1279 r1304  
    298298  decodeDBBPFlag( pcCU, uiAbsPartIdx, uiDepth );
    299299#endif
    300   //decodeSDCFlag ( pcCU, uiAbsPartIdx, uiDepth );
    301 
     300#if NH_3D_SDC_INTER
     301  decodeSDCFlag ( pcCU, uiAbsPartIdx, uiDepth );
     302#endif
    302303#if NH_3D_ARP
    303304  decodeARPW  ( pcCU, uiAbsPartIdx, uiDepth );
    … …  
    10921093}
    10931094#endif
    1094 #if H_3D_INTER_SDC
     1095#if NH_3D_SDC_INTER
    10951096  if( pcCU->getSDCFlag( uiAbsPartIdx ) && !pcCU->isIntra( uiAbsPartIdx) )
    10961097  {
    … …  
    11031104  if( pcCU->getSlice()->getIsDepth() )
    11041105  {
    1105 #if NH_3D_SDC_INTRA || H_3D_INTER_SDC
     1106#if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    11061107    if( pcCU->getSDCFlag( uiAbsPartIdx ) )
    11071108    {
    … …  
    11611162}
    11621163
    1163 #if NH_3D_SDC_INTRA || H_3D_INTER_SDC
     1164#if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    11641165Void TDecEntropy::decodeSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    11651166{

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecEntropy.h

    r1279 r1304  
    8989  virtual Void parseICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9090#endif
    91 #if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
     91#if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    9292  virtual Void  parseDeltaDC      ( TComDataCU* pcCU, UInt absPartIdx, UInt depth ) = 0;
    9393#endif
    94 #if NH_3D_SDC_INTRA || H_3D_INTER_SDC
     94#if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    9595  virtual Void parseSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9696#endif
    … …  
    181181#endif
    182182
    183 #if NH_3D_SDC_INTRA || H_3D_INTER_SDC
     183#if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    184184  Void decodeSDCFlag           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    185185#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecSbac.cpp

    r1279 r1304  
    111111, m_cDmmModeSCModel                          ( 1,             1,                      NUM_DMM_MODE_CTX                     , m_contextModels + m_numContextModels, m_numContextModels)
    112112#endif
    113 #if NH_3D_DMM || NH_3D_SDC_INTRA
     113#if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    114114, m_cDdcDataSCModel                          ( 1,             1,                      NUM_DDC_DATA_CTX                     , m_contextModels + m_numContextModels, m_numContextModels)
     115, m_cSDCFlagSCModel                          ( 1,             1,                     NUM_SDC_FLAG_CTX                      , m_contextModels + m_numContextModels, m_numContextModels)
    115116#endif
    116117#if NH_3D_SDC_INTRA
    117118, m_cSDCResidualFlagSCModel                  ( 1,             1,                     SDC_NUM_RESIDUAL_FLAG_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
    118119, m_cSDCResidualSCModel                      ( 1,             1,                     SDC_NUM_RESIDUAL_CTX                  , m_contextModels + m_numContextModels, m_numContextModels)
    119 , m_cSDCFlagSCModel                          ( 1,             1,                     NUM_SDC_FLAG_CTX                      , m_contextModels + m_numContextModels, m_numContextModels)
    120120, m_cDdcFlagSCModel                          ( 1,             1,                     NUM_DDC_FLAG_CTX                      , m_contextModels + m_numContextModels, m_numContextModels)
    121121#endif
    … …  
    202202  m_cDmmModeSCModel.initBuffer                    ( sliceType, qp, (UChar*)INIT_DMM_MODE );
    203203#endif
    204 #if NH_3D_DMM || NH_3D_SDC_INTRA
     204#if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    205205  m_cDdcDataSCModel.initBuffer                    ( sliceType, qp, (UChar*)INIT_DDC_DATA );
     206  m_cSDCFlagSCModel.initBuffer                    ( sliceType, qp, (UChar*)INIT_SDC_FLAG );
    206207#endif
    207208#if NH_3D_SDC_INTRA
    208209  m_cSDCResidualFlagSCModel.initBuffer            ( sliceType, qp, (UChar*)INIT_SDC_RESIDUAL_FLAG );
    209210  m_cSDCResidualSCModel.initBuffer                ( sliceType, qp, (UChar*)INIT_SDC_RESIDUAL );
    210   m_cSDCFlagSCModel.initBuffer                    ( sliceType, qp, (UChar*)INIT_SDC_FLAG );
    211211  m_cDdcFlagSCModel.initBuffer                    ( sliceType, qp, (UChar*)INIT_DDC_FLAG );
    212212#endif
    … …  
    23192319#endif
    23202320
    2321 #if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
     2321#if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    23222322Void TDecSbac::parseDeltaDC( TComDataCU* pcCU, UInt absPartIdx, UInt depth )
    23232323{
    2324 #if NH_3D_SDC_INTRA || H_3D_INTER_SDC
     2324#if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    23252325  if( !(pcCU->getSDCFlag( absPartIdx )) )
    23262326#endif
    … …  
    23702370#endif
    23712371    }
    2372 #if H_3D_INTER_SDC
     2372#if NH_3D_SDC_INTER
    23732373    else
    23742374    {
    … …  
    24892489}
    24902490#endif
    2491 #if NH_3D_SDC_INTRA || H_3D_INTER_SDC
     2491#if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    24922492Void TDecSbac::parseSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    24932493{

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecSbac.h

    r1279 r1304  
    107107  Void  xReadCoefRemainExGolomb ( UInt &rSymbol, UInt &rParam, const Bool useLimitedPrefixLength, const Int maxLog2TrDynamicRange );
    108108#endif
    109 #if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
     109#if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    110110  Void  xReadExGolombLevelDdc( UInt& ruiSymbol );
    111111  Void  xParseDeltaDC        ( Pel& rValDeltaDC, UInt uiNumSeg );
    … …  
    119119  Void  xParseSDCResidualData     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPart );
    120120#endif
    121 #if NH_3D_SDC_INTRA || H_3D_INTER_SDC
     121#if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    122122  Void  parseSDCFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    123123#endif
    … …  
    136136  Void parseDIS          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    137137#endif
    138 #if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
     138#if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    139139  Void  parseDeltaDC      ( TComDataCU* pcCU, UInt absPartIdx, UInt depth );
    140140#endif
    … …  
    229229  ContextModel3DBuffer m_cDmmModeSCModel;
    230230#endif
    231 #if NH_3D_DMM || NH_3D_SDC_INTRA
     231#if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    232232  ContextModel3DBuffer m_cDdcDataSCModel;
     233  ContextModel3DBuffer m_cSDCFlagSCModel;
    233234#endif
    234235#if NH_3D_SDC_INTRA 
    235236  ContextModel3DBuffer m_cSDCResidualFlagSCModel;
    236237  ContextModel3DBuffer m_cSDCResidualSCModel;
    237   ContextModel3DBuffer m_cSDCFlagSCModel;
    238238  ContextModel3DBuffer m_cDdcFlagSCModel;
    239239#endif
Note: See TracChangeset for help on using the changeset viewer.