Ignore:
Timestamp:
11 Jul 2013, 16:03:14 (12 years ago)
Author:
tech
Message:

Merged HTM-DEV-0.3-dev1 Rev. 520.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncEntropy.cpp

    r521 r531  
    257257    return;
    258258  }
     259#if H_3D_DIM_SDC
     260  if( pcCU->getSDCFlag(uiAbsPartIdx) )
     261  {
     262    return;
     263  }
     264#endif
    259265 
    260266  if( bRD )
     
    469475  {
    470476    encodeIntraDirModeLuma  ( pcCU, uiAbsPartIdx,true );
     477#if H_3D_DIM_SDC
     478    if(!pcCU->getSDCFlag(uiAbsPartIdx))
     479#endif
    471480    encodeIntraDirModeChroma( pcCU, uiAbsPartIdx, bRD );
    472481  }
     
    641650  UInt uiChromaOffset = uiLumaOffset>>2;
    642651   
     652#if H_3D_DIM_SDC
     653  if( pcCU->getSDCFlag( uiAbsPartIdx ) )
     654  {
     655    assert( pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2Nx2N );
     656    assert( pcCU->getTransformIdx(uiAbsPartIdx) == 0 );
     657    assert( pcCU->getCbf(uiAbsPartIdx, TEXT_LUMA) == 1 );
     658    assert( pcCU->getCbf(uiAbsPartIdx, TEXT_CHROMA_U) == 1 );
     659    assert( pcCU->getCbf(uiAbsPartIdx, TEXT_CHROMA_V) == 1 );
     660    return;
     661  }
     662#endif
     663
    643664  if( pcCU->isIntra(uiAbsPartIdx) )
    644665  {
Note: See TracChangeset for help on using the changeset viewer.