Changeset 175 in 3DVCSoftware for branches/HTM-4.1-dev1-HHI/source/Lib


Ignore:
Timestamp:
9 Nov 2012, 15:31:44 (12 years ago)
Author:
tech
Message:

Fixed wrong data types in RDO (FIX_RDO_NEGDIST)

Location:
branches/HTM-4.1-dev1-HHI/source/Lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TComDataCU.h

    r169 r175  
    236236  Bool          m_bDecSubCu;          ///< indicates decoder-mode
    237237  Double        m_dTotalCost;         ///< sum of partition RD costs
     238#if FIX_RDO_NEGDIST
     239  Dist          m_uiTotalDistortion;  ///< sum of partition distortion
     240#else
    238241  UInt          m_uiTotalDistortion;  ///< sum of partition distortion
     242#endif
    239243  UInt          m_uiTotalBits;        ///< sum of partition bits
    240244  UInt          m_uiTotalBins;       ///< sum of partition bins
     
    736740 
    737741  Double&       getTotalCost()                  { return m_dTotalCost;        }
     742#if FIX_RDO_NEGDIST
     743  Dist&         getTotalDistortion()            { return m_uiTotalDistortion; }
     744#else
    738745  UInt&         getTotalDistortion()            { return m_uiTotalDistortion; }
     746#endif
    739747  UInt&         getTotalBits()                  { return m_uiTotalBits;       }
    740748  UInt&         getTotalNumPart()               { return m_uiNumPartition;    }
  • branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TypeDef.h

    r174 r175  
    6060#define FIX_LGE_IVMP_PARALLEL_MERGE_B0136 1
    6161#define TMVP_DEPTH_SWITCH                 1 // related to JCT3V-B0092
    62 
     62#define FIX_RDO_NEGDIST                   1
    6363
    6464#define DV_DERIVATION_PARALLEL_B0096      1 //JCT3V-B0096, enable parallel derivation of disparity vector
  • branches/HTM-4.1-dev1-HHI/source/Lib/TLibEncoder/TEncSearch.cpp

    r163 r175  
    18301830  UInt    uiQNumParts    = pcCU->getTotalNumPart() >> 2;
    18311831  UInt    uiWidthBit     = pcCU->getIntraSizeIdx(0);
     1832#if FIX_RDO_NEGDIST
     1833  Dist    uiOverallDistY = 0;
     1834  Dist    uiOverallDistC = 0;
     1835#else
    18321836  UInt    uiOverallDistY = 0;
    18331837  UInt    uiOverallDistC = 0;
     1838#endif
    18341839  UInt    CandNum;
    18351840  Double  CandCostList[ FAST_UDI_MAX_RDMODE_NUM ];
     
    20982103   
    20992104    UInt    uiBestPUMode  = 0;
     2105#if FIX_RDO_NEGDIST
     2106    Dist    uiBestPUDistY = 0;
     2107    Dist    uiBestPUDistC = 0;
     2108#else
    21002109    UInt    uiBestPUDistY = 0;
    21012110    UInt    uiBestPUDistC = 0;
     2111#endif
    21022112    Double  dBestPUCost   = MAX_DOUBLE;
    21032113    for( UInt uiMode = 0; uiMode < numModesForFullRD; uiMode++ )
     
    52155225    }
    52165226   
     5227#if FIX_RDO_NEGDIST
     5228    Dist uiDistU = 0;
     5229    Dist uiDistV = 0;
     5230#else
    52175231    UInt uiDistU = 0;
    52185232    UInt uiDistV = 0;
     5233#endif
    52195234    if( bCodeChroma )
    52205235    {
     
    52545269#endif       
    52555270       
     5271#if FIX_RDO_NEGDIST
     5272        const Dist uiNonzeroDistU = m_pcRdCost->getDistPart( m_pcQTTempTComYuv[uiQTTempAccessLayer].getCbAddr( absTUPartIdxC), m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(),
     5273          pcResi->getCbAddr( absTUPartIdxC), pcResi->getCStride(), trWidthC, trHeightC
     5274
     5275#else
    52565276        const UInt uiNonzeroDistU = m_pcRdCost->getDistPart( m_pcQTTempTComYuv[uiQTTempAccessLayer].getCbAddr( absTUPartIdxC), m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(),
    52575277          pcResi->getCbAddr( absTUPartIdxC), pcResi->getCStride(), trWidthC, trHeightC
     5278#endif
    52585279#if WEIGHTED_CHROMA_DISTORTION
    52595280          , true
     
    53405361        m_pcTrQuant->invtransformNxN( TEXT_CHROMA,REG_DCT, pcResiCurrV, m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(), pcCoeffCurrV, trWidthC, trHeightC, scalingListType );
    53415362#endif
    5342        
     5363#if FIX_RDO_NEGDIST
     5364        const Dist uiNonzeroDistV = m_pcRdCost->getDistPart( m_pcQTTempTComYuv[uiQTTempAccessLayer].getCrAddr( absTUPartIdxC ), m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(),
     5365          pcResi->getCrAddr( absTUPartIdxC ), pcResi->getCStride(), trWidthC, trHeightC
     5366#else
    53435367        const UInt uiNonzeroDistV = m_pcRdCost->getDistPart( m_pcQTTempTComYuv[uiQTTempAccessLayer].getCrAddr( absTUPartIdxC ), m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(),
    53445368          pcResi->getCrAddr( absTUPartIdxC ), pcResi->getCStride(), trWidthC, trHeightC
     5369#endif
    53455370#if WEIGHTED_CHROMA_DISTORTION
    53465371                                                   , true
Note: See TracChangeset for help on using the changeset viewer.