Changeset 1179 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRdCost.cpp
- Timestamp:
- 7 Apr 2015, 17:05:30 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/Lib/TLibCommon/TComRdCost.cpp
r884 r1179 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * … … 341 341 else if( eDFunc >= DF_HADS && eDFunc <= DF_HADS16N ) 342 342 { 343 #if !RWTH_DBBP_NO_SATD_K0028 343 344 rcDistParam.DistFunc = TComRdCost::xGetMaskedHADs; 345 #else 346 rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD; 347 #endif 344 348 } 345 349 else if( eDFunc >= DF_VSD && eDFunc <= DF_VSD16N ) … … 441 445 if( m_bUseMask ) 442 446 { 447 #if !RWTH_DBBP_NO_SATD_K0028 443 448 rcDistParam.DistFunc = (bHADME)?TComRdCost::xGetMaskedHADs:TComRdCost::xGetMaskedSAD; 449 #else 450 rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD; 451 #endif 444 452 } 445 453 #endif … … 464 472 if( m_bUseMask ) 465 473 { 474 #if !RWTH_DBBP_NO_SATD_K0028 466 475 rcDP.DistFunc = (bHadamard)?TComRdCost::xGetMaskedHADs:TComRdCost::xGetMaskedSAD; 476 #else 477 rcDP.DistFunc = TComRdCost::xGetMaskedSAD; 478 #endif 467 479 } 468 480 #endif … … 717 729 } 718 730 731 #if !RWTH_DBBP_NO_SATD_K0028 719 732 UInt TComRdCost::xGetMaskedHADs( DistParam* pcDtParam ) 720 733 { … … 834 847 return uiSum >> DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth-8); 835 848 } 849 #endif 836 850 837 851 UInt TComRdCost::xGetMaskedVSD( DistParam* pcDtParam )
Note: See TracChangeset for help on using the changeset viewer.