Ignore:
Timestamp:
4 Feb 2013, 01:35:46 (12 years ago)
Author:
lg
Message:

Integration of JCT3V-C0044

Location:
branches/HTM-5.1-dev1-LG/source/Lib/TLibEncoder
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev1-LG/source/Lib/TLibEncoder/TEncSbac.cpp

    r229 r251  
    10961096
    10971097    if( uiDir == DMM_WEDGE_PREDTEX_D_IDX )     { xCodeWedgePredTexDeltaInfo  ( pcCU, uiAbsPartIdx ); }
     1098#if LGE_DMM3_SIMP_C0044
     1099    if( uiDir == DMM_WEDGE_PREDTEX_IDX )       { xCodeWedgePredTexInfo       ( pcCU, uiAbsPartIdx ); }
     1100#endif
    10981101    if( uiDir == DMM_CONTOUR_PREDTEX_D_IDX )   { xCodeContourPredTexDeltaInfo( pcCU, uiAbsPartIdx ); }
    10991102#endif
     
    26712674#endif
    26722675#if HHI_DMM_PRED_TEX
     2676#if LGE_DMM3_SIMP_C0044
     2677Void TEncSbac::xCodeWedgePredTexInfo( TComDataCU* pcCU, UInt uiAbsPartIdx )
     2678{
     2679  Int iIntraIdx = pcCU->getIntraSizeIdx(uiAbsPartIdx);
     2680  Int iBits = g_aucWedgeTexPredBitsListIdx[iIntraIdx];
     2681
     2682  UInt uiTabIdx = pcCU->getWedgePredTexIntraTabIdx( uiAbsPartIdx );
     2683
     2684  for ( Int i = 0; i < iBits; i++ )
     2685  {
     2686    m_pcBinIf->encodeBin( ( uiTabIdx >> i ) & 1, m_cDmmDataSCModel.get(0, 0, 3) );
     2687  }
     2688}
     2689#endif
     2690
    26732691Void TEncSbac::xCodeWedgePredTexDeltaInfo( TComDataCU* pcCU, UInt uiAbsPartIdx )
    26742692{
     2693#if LGE_DMM3_SIMP_C0044
     2694  xCodeWedgePredTexInfo( pcCU, uiAbsPartIdx );
     2695#endif
    26752696  Int iDeltaDC1 = pcCU->getWedgePredTexDeltaDC1( uiAbsPartIdx );
    26762697  Int iDeltaDC2 = pcCU->getWedgePredTexDeltaDC2( uiAbsPartIdx );
  • branches/HTM-5.1-dev1-LG/source/Lib/TLibEncoder/TEncSbac.h

    r210 r251  
    178178#endif
    179179#if HHI_DMM_PRED_TEX
     180#if LGE_DMM3_SIMP_C0044
     181  Void  xCodeWedgePredTexInfo       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
     182#endif
    180183  Void  xCodeWedgePredTexDeltaInfo  ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    181184  Void  xCodeContourPredTexDeltaInfo( TComDataCU* pcCU, UInt uiAbsPartIdx );
  • branches/HTM-5.1-dev1-LG/source/Lib/TLibEncoder/TEncSearch.cpp

    r242 r251  
    22522252      Int  iTexDeltaDC1 = 0;
    22532253      Int  iTexDeltaDC2 = 0;
     2254#if LGE_DMM3_SIMP_C0044
     2255      UInt uiTexIntraIdx = 0;
     2256      findWedgeTexMinDist( pcCU, uiPartOffset, piOrg, piPred, uiStride, uiWidth, uiHeight, uiTexTabIdx, iTexDeltaDC1, iTexDeltaDC2, bAboveAvail, bLeftAvail, uiTexIntraIdx);
     2257      pcCU->setWedgePredTexIntraTabIdxSubParts( uiTexIntraIdx, uiPartOffset, uiDepth + uiInitTrDepth );
     2258#else
    22542259      findWedgeTexMinDist( pcCU, uiPartOffset, piOrg, piPred, uiStride, uiWidth, uiHeight, uiTexTabIdx, iTexDeltaDC1, iTexDeltaDC2, bAboveAvail, bLeftAvail );
     2260#endif
    22552261      pcCU->setWedgePredTexTabIdxSubParts  ( uiTexTabIdx,  uiPartOffset, uiDepth + uiInitTrDepth );
    22562262      pcCU->setWedgePredTexDeltaDC1SubParts( iTexDeltaDC1, uiPartOffset, uiDepth + uiInitTrDepth );
     
    71617167                                      Int&         riDeltaDC2,
    71627168                                      Bool         bAboveAvail,
    7163                                       Bool         bLeftAvail )
     7169                                      Bool         bLeftAvail
     7170#if LGE_DMM3_SIMP_C0044
     7171                                      ,UInt&        ruiIntraTabIdx
     7172#endif
     7173                                      )
    71647174{
    71657175  assert( uiWidth >= DMM_WEDGEMODEL_MIN_SIZE && uiWidth <= DMM_WEDGEMODEL_MAX_SIZE );
    71667176  WedgeList* pacWedgeList = &g_aacWedgeLists[(g_aucConvertToBit[uiWidth])];
    71677177
     7178#if LGE_DMM3_SIMP_C0044
     7179  ruiTabIdx = getBestWedgeFromTex( pcCU, uiAbsPtIdx, uiWidth, uiHeight, piOrig, uiStride, ruiIntraTabIdx );
     7180#else
    71687181  ruiTabIdx = getBestWedgeFromTex( pcCU, uiAbsPtIdx, uiWidth, uiHeight );
     7182#endif
    71697183
    71707184  TComWedgelet* pcBestWedgelet = &(pacWedgeList->at(ruiTabIdx));
  • branches/HTM-5.1-dev1-LG/source/Lib/TLibEncoder/TEncSearch.h

    r210 r251  
    435435                                    Int&           riDeltaDC2,
    436436                                    Bool           bAboveAvail,
    437                                     Bool           bLeftAvail );
     437                                    Bool           bLeftAvail
     438#if LGE_DMM3_SIMP_C0044
     439                                    ,UInt&         ruiIntraTabIdx
     440#endif
     441                                    );
    438442  Void findContourPredTex         ( TComDataCU*    pcCU,
    439443                                    UInt           uiAbsPtIdx,
Note: See TracChangeset for help on using the changeset viewer.