Changeset 311 in 3DVCSoftware for branches/HTM-6.0-dev0


Ignore:
Timestamp:
15 Mar 2013, 17:24:18 (11 years ago)
Author:
tech
Message:

Incorporated FIX_CHROMA_RESIDUAL_C0129.

Location:
branches/HTM-6.0-dev0/source/Lib/TLibCommon
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.0-dev0/source/Lib/TLibCommon/TComRdCostWeightPrediction.cpp

    r305 r311  
    8181  wpScalingParam  *wpCur    = &(pcDtParam->wpCur[uiComp]);
    8282  Int   w0      = wpCur->w,
    83         offset  = wpCur->offset,
    84         shift   = wpCur->shift,
    85         round   = wpCur->round;
    86  
     83    offset  = wpCur->offset,
     84    shift   = wpCur->shift,
     85    round   = wpCur->round;
     86
    8787  UInt uiSum = 0;
    88   #if HHI_INTERVIEW_SKIP
     88#if HHI_INTERVIEW_SKIP
    8989  if( pcDtParam->pUsed )
    9090  {
    9191    Pel*  piUsed      = pcDtParam->pUsed;
    9292    Int   iStrideUsed = pcDtParam->iStrideUsed;
    93   for( ; iRows != 0; iRows-- )
    94   {
    95     for (Int n = 0; n < iCols; n++ )
    96     {
     93    for( ; iRows != 0; iRows-- )
     94    {
     95      for (Int n = 0; n < iCols; n++ )
     96      {
    9797        if( piUsed[n])
    9898        {
    99       pred = ( (w0*piCur[n] + round) >> shift ) + offset ;
    100       //uiSum += abs( piOrg[n] - piCur[n] );
    101       uiSum += abs( piOrg[n] - pred );
    102     }
    103     }
    104     piOrg += iStrideOrg;
    105     piCur += iStrideCur;
     99          pred = ( (w0*piCur[n] + round) >> shift ) + offset ;
     100          uiSum += abs( piOrg[n] - pred );
     101        }
     102      }
     103      piOrg += iStrideOrg;
     104      piCur += iStrideCur;
    106105      piUsed += iStrideUsed;
    107   }
     106    }
    108107#if FIX_LGE_WP_FOR_3D_C0223
    109108  }
     
    115114#endif
    116115#endif
    117   for( ; iRows != 0; iRows-- )
    118   {
    119     for (Int n = 0; n < iCols; n++ )
    120     {
    121       pred = ( (w0*piCur[n] + round) >> shift ) + offset ;
    122  
    123       uiSum += abs( piOrg[n] - pred );
    124     }
    125     piOrg += iStrideOrg;
    126     piCur += iStrideCur;
    127   }
     116    for( ; iRows != 0; iRows-- )
     117    {
     118      for (Int n = 0; n < iCols; n++ )
     119      {
     120        pred = ( (w0*piCur[n] + round) >> shift ) + offset ;
     121        uiSum += abs( piOrg[n] - pred );
     122      }
     123      piOrg += iStrideOrg;
     124      piCur += iStrideCur;
     125    }
    128126#if FIX_LGE_WP_FOR_3D_C0223 //comment of #endif
    129   //#endif
     127    //#endif
    130128#endif
    131     #if HHI_INTERVIEW_SKIP
    132       }
    133     #endif
     129#if HHI_INTERVIEW_SKIP
     130  }
     131#endif
    134132  pcDtParam->uiComp = 255;  // reset for DEBUG (assert test)
    135133
  • branches/HTM-6.0-dev0/source/Lib/TLibCommon/TComResidualGenerator.cpp

    r296 r311  
    614614  Int           iDesStrideC = pcYuv    ->getCStride();
    615615#if MTK_RELEASE_DV_CONSTRAINT_C0129
     616#if FIX_CHROMA_RESIDUAL_C0129
     617  Pel*          pSrcSamplesU0= pcBaseRes->getCbAddr ( 0 ) + iCRefPosY0 * iSrcStrideC;
     618  Pel*          pSrcSamplesU1= pcBaseRes->getCbAddr ( 0 ) + iCRefPosY1 * iSrcStrideC;
     619  Pel*          pSrcSamplesV0= pcBaseRes->getCrAddr ( 0 ) + iCRefPosY0 * iSrcStrideC;
     620  Pel*          pSrcSamplesV1= pcBaseRes->getCrAddr ( 0 ) + iCRefPosY1 * iSrcStrideC;
     621#else
    616622  Pel*          pSrcSamplesU0= pcBaseRes->getCbAddr ( 0 ) + ( iCRefPosY0 >> 1 ) * iSrcStrideC;
    617623  Pel*          pSrcSamplesU1= pcBaseRes->getCbAddr ( 0 ) + ( iCRefPosY1 >> 1 ) * iSrcStrideC;
    618624  Pel*          pSrcSamplesV0= pcBaseRes->getCrAddr ( 0 ) + ( iCRefPosY0 >> 1 ) * iSrcStrideC;
    619625  Pel*          pSrcSamplesV1= pcBaseRes->getCrAddr ( 0 ) + ( iCRefPosY1 >> 1 ) * iSrcStrideC;
     626#endif
    620627#else
    621628  Pel*          pSrcSamplesU= pcBaseRes->getCbAddr ( 0 ) + ( uiYPos >> 1 ) * iSrcStrideC;
  • branches/HTM-6.0-dev0/source/Lib/TLibCommon/TypeDef.h

    r310 r311  
    121121#define MTK_RELEASE_DV_CONSTRAINT_C0129   1   // JCT3V-C0129
    122122#define MTK_SIMPLIFY_DVTC_C0135           1   // JCT3V-C0135
     123#define FIX_CHROMA_RESIDUAL_C0129         1
    123124
    124125///// ***** MOTION PARAMETER INHERITANCE  *********
Note: See TracChangeset for help on using the changeset viewer.