Changeset 1405 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncCu.cpp


Ignore:
Timestamp:
27 May 2016, 17:32:40 (8 years ago)
Author:
tech
Message:

Merged HTM-16.1-dev@1404.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibEncoder/TEncCu.cpp

    r1396 r1405  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2016, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    10961096        // do normal intra modes
    10971097        // speedup for inter frames
    1098         Double intraCost = 0.0;
    10991098
    11001099        if((rpcBestCU->getSlice()->getSliceType() == I_SLICE)                                     ||
     
    11221121            if( bUseIVP )
    11231122            {
    1124               xCheckRDCostIntra( rpcBestCU, rpcTempCU, intraCost, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
    1125 #else
    1126           xCheckRDCostIntra( rpcBestCU, rpcTempCU, intraCost, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug) );
     1123              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
     1124#else
     1125          xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug) );
    11271126#endif
    11281127#if KWU_RC_MADPRED_E0227
     
    11431142            if( rpcTempCU->getWidth(0) > ( 1 << sps.getQuadtreeTULog2MinSize() ) )
    11441143            {
    1145               Double tmpIntraCost;
    11461144#if NH_3D_ENC_DEPTH
    1147               xCheckRDCostIntra( rpcBestCU, rpcTempCU, tmpIntraCost, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
    1148 #else
    1149               xCheckRDCostIntra( rpcBestCU, rpcTempCU, tmpIntraCost, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug)   );
    1150 #endif
    1151 
    1152               intraCost = std::min(intraCost, tmpIntraCost);
     1145              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
     1146#else
     1147              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug)   );
     1148#endif       
    11531149              rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
    11541150            }
     
    27842780Void TEncCu::xCheckRDCostIntra( TComDataCU *&rpcBestCU,
    27852781                                TComDataCU *&rpcTempCU,
    2786                                 Double      &cost,
    27872782                                PartSize     eSize
    27882783                                DEBUG_STRING_FN_DECLARE(sDebug)
     
    28952890
    28962891  xCheckDQP( rpcTempCU );
    2897 
    2898   cost = rpcTempCU->getTotalCost();
    28992892
    29002893  xCheckBestMode(rpcBestCU, rpcTempCU, uiDepth DEBUG_STRING_PASS_INTO(sDebug) DEBUG_STRING_PASS_INTO(sTest));
Note: See TracChangeset for help on using the changeset viewer.