Changeset 699 in 3DVCSoftware


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
Files:
2 added
15 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-8.2-dev3-Samsung/cfg/3D-HEVC/NonCTC/fco/baseCfg_3view+depth.cfg

    r697 r699  
    227227IvMvPred                            : 1                # Inter-view motion prediction
    228228AdvMultiviewResPred                 : 1                # Advanced inter-view residual prediction (0:off, 1:on)
    229 IlluCompEnable                      : 1 1              # Enable Illumination compensation ( 0: off, 1: on )  (v/d)
     229IlluCompEnable                      : 1                # Enable Illumination compensation ( 0: off, 1: on )  (v/d)
    230230ViewSynthesisPred                   : 1                # View synthesis prediction
    231231DepthRefinement                     : 1                # Dispary refined by depth DoNBDV

  • branches/HTM-8.2-dev3-Samsung/cfg/3D-HEVC/NonCTC/rc/baseCfg_3view+depth_rate_control.cfg

    r697 r699  
    239239IvMvPred                            : 1                # Inter-view motion prediction
    240240AdvMultiviewResPred                 : 1                # Advanced inter-view residual prediction (0:off, 1:on)
    241 IlluCompEnable                      : 1 1              # Enable Illumination compensation ( 0: off, 1: on )  (v/d)
     241IlluCompEnable                      : 1                # Enable Illumination compensation ( 0: off, 1: on )  (v/d)
    242242ViewSynthesisPred                   : 1                # View synthesis prediction
    243243DepthRefinement                     : 1                # Dispary refined by depth DoNBDV

  • branches/HTM-8.2-dev3-Samsung/cfg/3D-HEVC/baseCfg_2view+depth.cfg

    r697 r699  
    197197IvMvPred                            : 1                # Inter-view motion prediction
    198198AdvMultiviewResPred                 : 1                # Advanced inter-view residual prediction (0:off, 1:on)
    199 IlluCompEnable                      : 1 1              # Enable Illumination compensation ( 0: off, 1: on )   (v/d)
     199IlluCompEnable                      : 1                # Enable Illumination compensation ( 0: off, 1: on )   (v/d)
    200200ViewSynthesisPred                   : 1                # View synthesis prediction
    201201DepthRefinement                     : 1                # Dispary refined by depth DoNBDV

  • branches/HTM-8.2-dev3-Samsung/cfg/3D-HEVC/baseCfg_2view.cfg

    r622 r699  
    170170IvMvPred                            : 1                # Inter-view motion prediction
    171171AdvMultiviewResPred                 : 1                # Advanced inter-view residual prediction (0:off, 1:on)
    172 IlluCompEnable                      : 1 1              # Enable Illumination compensation ( 0: off, 1: on ) (v/d)
     172IlluCompEnable                      : 1                # Enable Illumination compensation ( 0: off, 1: on ) (v/d)
    173173ViewSynthesisPred                   : 1                # View synthesis prediction
    174174DepthRefinement                     : 1                # Dispary refined by depth DoNBDV

  • branches/HTM-8.2-dev3-Samsung/cfg/3D-HEVC/baseCfg_3view+depth.cfg

    r697 r699  
    227227IvMvPred                            : 1                # Inter-view motion prediction
    228228AdvMultiviewResPred                 : 1                # Advanced inter-view residual prediction (0:off, 1:on)
    229 IlluCompEnable                      : 1 1              # Enable Illumination compensation ( 0: off, 1: on )  (v/d)
     229IlluCompEnable                      : 1                # Enable Illumination compensation ( 0: off, 1: on )  (v/d)
    230230ViewSynthesisPred                   : 1                # View synthesis prediction
    231231DepthRefinement                     : 1                # Dispary refined by depth DoNBDV

  • branches/HTM-8.2-dev3-Samsung/cfg/3D-HEVC/fullCfg.cfg

    r697 r699  
    254254IvMvPred                            : 1                # Inter-view motion prediction
    255255AdvMultiviewResPred                 : 1                # Advanced inter-view residual prediction (0:off, 1:on)
    256 IlluCompEnable                      : 1 1              # Enable Illumination compensation ( 0: off, 1: on ) (v/d)
     256IlluCompEnable                      : 1                # Enable Illumination compensation ( 0: off, 1: on ) (v/d)
    257257ViewSynthesisPred                   : 1                # View synthesis prediction
    258258DepthRefinement                     : 1                # Dispary refined by depth DoNBDV

  • branches/HTM-8.2-dev3-Samsung/source/App/TAppEncoder/TAppEncCfg.cpp

    r697 r699  
    511511#endif
    512512#if H_3D_IC
     513#if SEC_ONLY_TEXTURE_IC_F0151
     514  ("IlluCompEnable",           m_abUseIC, true, "Enable illumination compensation")
     515#else
    513516  ("IlluCompEnable",           m_abUseIC, std::vector<Bool>(2, true), "Enable illumination compensation")
     517#endif
    514518#endif
    515519#if H_3D_INTER_SDC
    … …  
    24222426#endif
    24232427#if H_3D_IC
     2428#if SEC_ONLY_TEXTURE_IC_F0151
     2429  printf( "IlluCompEnable: %d ", m_abUseIC);
     2430#else
    24242431  printf( "IlluCompEnable: %d %d ", m_abUseIC[0] ? 1 : 0, m_abUseIC[1] ? 1 : 0 );
     2432#endif
    24252433#endif
    24262434#if H_3D_NBDV_REF

  • branches/HTM-8.2-dev3-Samsung/source/App/TAppEncoder/TAppEncCfg.h

    r697 r699  
    122122#endif
    123123#if H_3D_IC
     124#if SEC_ONLY_TEXTURE_IC_F0151
     125  Bool   m_abUseIC;
     126#else
    124127  vector<Bool> m_abUseIC;                                    ///< flag for using illumination compensation for inter-view prediction
     128#endif
    125129#endif
    126130#if H_3D_NBDV_REF

  • branches/HTM-8.2-dev3-Samsung/source/App/TAppEncoder/TAppEncTop.cpp

    r697 r699  
    177177#endif
    178178#if H_3D_IC
     179#if SEC_ONLY_TEXTURE_IC_F0151
     180    m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_abUseIC );
     181#else
    179182    m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 ? false : m_abUseIC[isDepth ? 1 : 0] );
     183#endif
    180184#endif
    181185  //========== Depth intra modes ==========

  • 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.