Changeset 699 in 3DVCSoftware for branches/HTM-8.2-dev3-Samsung/source/Lib


Ignore:
Timestamp:
15 Nov 2013, 05:46:48 (11 years ago)
Author:
samsung-htm
Message:

Integration of F0147 and F0151
F0147: DMM simplification and signalling
F0151: Removal of IC in depth coding

Location:
branches/HTM-8.2-dev3-Samsung/source/Lib
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.2-dev3-Samsung/source/Lib/TLibCommon/TypeDef.h

    r697 r699  
    107107
    108108#define LGE_IC_CTX_F0160 1 //JCT3V-F0160
     109#define SEC_ONLY_TEXTURE_IC_F0151         1
    109110
    110111#if H_3D_NBDV
  • branches/HTM-8.2-dev3-Samsung/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r655 r699  
    17951795    }
    17961796#if H_3D_IC
     1797#if SEC_ONLY_TEXTURE_IC_F0151
     1798    else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) && !rpcSlice->getIsDepth())
     1799#else
    17971800    else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) )
     1801#endif
    17981802    {
    17991803      UInt uiCodeTmp = 0;
  • branches/HTM-8.2-dev3-Samsung/source/Lib/TLibDecoder/TDecEntropy.cpp

    r655 r699  
    111111  pcCU->setICFlagSubParts( false , uiAbsPartIdx, 0, uiDepth );
    112112
     113#if SEC_ONLY_TEXTURE_IC_F0151
     114  if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() )
     115#else
    113116  if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) )
     117#endif
    114118  {
    115119    return;
  • branches/HTM-8.2-dev3-Samsung/source/Lib/TLibEncoder/TEncCavlc.cpp

    r655 r699  
    13871387    }
    13881388#if H_3D_IC
     1389#if SEC_ONLY_TEXTURE_IC_F0151
     1390    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth())
     1391#else
    13891392    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) )
     1393#endif
    13901394    {
    13911395      WRITE_FLAG( pcSlice->getApplyIC() ? 1 : 0, "slice_ic_enable_flag" );
  • branches/HTM-8.2-dev3-Samsung/source/Lib/TLibEncoder/TEncCu.cpp

    r655 r699  
    497497#endif
    498498#if H_3D_IC
     499#if SEC_ONLY_TEXTURE_IC_F0151
     500  Bool bICEnabled = rpcTempCU->getSlice()->getViewIndex() && ( rpcTempCU->getSlice()->getSliceType() == P_SLICE || rpcTempCU->getSlice()->getSliceType() == B_SLICE ) && !rpcTempCU->getSlice()->getIsDepth();
     501#else
    499502  Bool bICEnabled = rpcTempCU->getSlice()->getViewIndex() && ( rpcTempCU->getSlice()->getSliceType() == P_SLICE || rpcTempCU->getSlice()->getSliceType() == B_SLICE );
     503#endif
    500504  bICEnabled = bICEnabled && rpcTempCU->getSlice()->getApplyIC();
    501505#endif
  • branches/HTM-8.2-dev3-Samsung/source/Lib/TLibEncoder/TEncEntropy.cpp

    r655 r699  
    160160Void TEncEntropy::encodeICFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    161161{
     162#if SEC_ONLY_TEXTURE_IC_F0151
     163  if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() )
     164#else
    162165  if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) )
     166#endif
    163167  {
    164168    return;
Note: See TracChangeset for help on using the changeset viewer.