Changeset 342 in 3DVCSoftware for branches/HTM-6.2-dev3-HHI/source


Ignore:
Timestamp:
29 Apr 2013, 13:08:07 (11 years ago)
Author:
hhi
Message:

JCT3V-D0035: DLT for DMM deltaDC coding - test1 (HHI_DELTADC_DLT_D0035)

Location:
branches/HTM-6.2-dev3-HHI/source/Lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev3-HHI/source/Lib/TLibCommon/TComPrediction.cpp

    r332 r342  
    5050#endif
    5151
     52#if HHI_DELTADC_DLT_D0035
     53#define GetDepthValue2Idx(val)     (pcCU->getSlice()->getSPS()->depthValue2idx(val))
     54#define GetIdx2DepthValue(val)     (pcCU->getSlice()->getSPS()->idx2DepthValue(val))
     55#endif
     56
    5257TComPrediction::TComPrediction()
    5358: m_pLumaRecBuffer(0)
     
    28732878
    28742879  // assign wedge pred DCs to prediction
    2875   if( bDelta ) { assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, Clip ( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) ); }
    2876   else         { assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride,        iPredDC1,                   iPredDC2           ); }
     2880  if( bDelta )
     2881  {
     2882#if HHI_DELTADC_DLT_D0035
     2883    assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, GetIdx2DepthValue( GetDepthValue2Idx(iPredDC1) + iDeltaDC1 ), GetIdx2DepthValue( GetDepthValue2Idx(iPredDC2) + iDeltaDC2 ) );
     2884#else
     2885    assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, Clip( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) );
     2886#endif
     2887  }
     2888  else
     2889  {
     2890    assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, iPredDC1, iPredDC2 );
     2891  }
    28772892}
    28782893
     
    28922907
    28932908  // assign wedge pred DCs to prediction
    2894   if( bDelta ) { assignWedgeDCs2Pred( pcContourWedge, piPred, uiStride, Clip ( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) ); }
    2895   else         { assignWedgeDCs2Pred( pcContourWedge, piPred, uiStride,        iPredDC1,                   iPredDC2           ); }
     2909  if( bDelta )
     2910  {
     2911#if HHI_DELTADC_DLT_D0035
     2912    assignWedgeDCs2Pred( pcContourWedge, piPred, uiStride, GetIdx2DepthValue( GetDepthValue2Idx(iPredDC1) + iDeltaDC1 ), GetIdx2DepthValue( GetDepthValue2Idx(iPredDC2) + iDeltaDC2 ) );
     2913#else
     2914    assignWedgeDCs2Pred( pcContourWedge, piPred, uiStride, Clip( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) );
     2915#endif
     2916  }
     2917  else
     2918  {
     2919    assignWedgeDCs2Pred( pcContourWedge, piPred, uiStride, iPredDC1, iPredDC2 );
     2920  }
    28962921
    28972922  pcContourWedge->destroy();
     
    30673092
    30683093  // assign wedge pred DCs to prediction
    3069   if( bDelta ) { assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, Clip( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) ); }
    3070   else         { assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, iPredDC1,           iPredDC2           ); }
     3094  if( bDelta )
     3095  {
     3096#if HHI_DELTADC_DLT_D0035
     3097    assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, GetIdx2DepthValue( GetDepthValue2Idx(iPredDC1) + iDeltaDC1 ), GetIdx2DepthValue( GetDepthValue2Idx(iPredDC2) + iDeltaDC2 ) );
     3098#else
     3099    assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, Clip( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) );
     3100#endif
     3101  }
     3102  else
     3103  {
     3104    assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, iPredDC1, iPredDC2 );
     3105  }
    30713106}
    30723107
     
    31023137
    31033138  // assign wedge pred DCs to prediction
    3104   if( bDelta ) { assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, Clip( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) ); }
    3105   else         { assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride,       iPredDC1,                   iPredDC2             ); }
     3139  if( bDelta )
     3140  {
     3141#if HHI_DELTADC_DLT_D0035
     3142    assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, GetIdx2DepthValue( GetDepthValue2Idx(iPredDC1) + iDeltaDC1 ), GetIdx2DepthValue( GetDepthValue2Idx(iPredDC2) + iDeltaDC2 ) );
     3143#else
     3144    assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, Clip( iPredDC1+iDeltaDC1 ), Clip( iPredDC2+iDeltaDC2 ) );
     3145#endif
     3146  }
     3147  else
     3148  {
     3149    assignWedgeDCs2Pred( pcWedgelet, piPred, uiStride, iPredDC1, iPredDC2 );
     3150  }
    31063151}
    31073152
  • branches/HTM-6.2-dev3-HHI/source/Lib/TLibCommon/TypeDef.h

    r332 r342  
    6767                                              // SAIT_SDC_C0096 JCT3V-C0096: Improved Simple Depth Coding(removal of DMM2 among four SDC modes(DC, Planar, DMM1 and DMM2))
    6868                                              // FIX_SDC_ENC_C0143, JCT3V-C0143 fix for unnecessary encoder checks in case of SDC
     69#if RWTH_SDC_DLT_B0036
     70#define HHI_DELTADC_DLT_D0035             1   // JCT3V-D0035: DLT for DMM deltaDC coding
     71#endif
    6972
    7073///// ***** TMVP/AMVP *********
  • branches/HTM-6.2-dev3-HHI/source/Lib/TLibEncoder/TEncSearch.cpp

    r332 r342  
    64786478#endif
    64796479
     6480#if HHI_DELTADC_DLT_D0035
     6481  riDeltaDC1 = (Int)GetDepthValue2Idx( Clip(iPredDC1 + riDeltaDC1) ) - (Int)GetDepthValue2Idx( iPredDC1 );
     6482  riDeltaDC2 = (Int)GetDepthValue2Idx( Clip(iPredDC2 + riDeltaDC2) ) - (Int)GetDepthValue2Idx( iPredDC2 );
     6483#endif
    64806484}
    64816485#endif
Note: See TracChangeset for help on using the changeset viewer.