Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComTrQuant.cpp


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComTrQuant.cpp

    r1405 r1413  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2016, ITU/ISO/IEC
     6 * Copyright (c) 2010-2017, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    11531153  if ( useRDOQ && (isLuma(compID) || RDOQ_CHROMA) )
    11541154  {
    1155 #if T0196_SELECTIVE_RDOQ
    11561155    if ( !m_useSelectiveRDOQ || xNeedRDOQ( rTu, piCoef, compID, cQP ) )
    11571156    {
    1158 #endif
    11591157#if ADAPTIVE_QP_SELECTION
    11601158      xRateDistOptQuant( rTu, piCoef, pDes, pArlDes, uiAbsSum, compID, cQP );
     
    11621160      xRateDistOptQuant( rTu, piCoef, pDes, uiAbsSum, compID, cQP );
    11631161#endif
    1164 #if T0196_SELECTIVE_RDOQ
    11651162    }
    11661163    else
     
    11691166      uiAbsSum = 0;
    11701167    }
    1171 #endif
    11721168  }
    11731169  else
     
    12431239    } // for n
    12441240
    1245     if( pcCU->getSlice()->getPPS()->getSignHideFlag() )
     1241    if( pcCU->getSlice()->getPPS()->getSignDataHidingEnabledFlag() )
    12461242    {
    12471243      if(uiAbsSum >= 2) //this prevents TUs with only one coefficient of value 1 from being tested
     
    12541250}
    12551251
    1256 #if T0196_SELECTIVE_RDOQ
    12571252Bool TComTrQuant::xNeedRDOQ( TComTU &rTu, TCoeff * pSrc, const ComponentID compID, const QpParam &cQP )
    12581253{
     
    13101305  return false;
    13111306}
    1312 #endif
    13131307
    13141308Void TComTrQuant::xDeQuant(       TComTU        &rTu,
     
    14341428                          Bool  bUseRDOQ,
    14351429                          Bool  bUseRDOQTS,
    1436 #if T0196_SELECTIVE_RDOQ
    14371430                          Bool  useSelectiveRDOQ,
    1438 #endif
    14391431                          Bool  bEnc,
    14401432                          Bool  useTransformSkipFast
     
    14481440  m_useRDOQ      = bUseRDOQ;
    14491441  m_useRDOQTS    = bUseRDOQTS;
    1450 #if T0196_SELECTIVE_RDOQ
    14511442  m_useSelectiveRDOQ = useSelectiveRDOQ;
    1452 #endif
    14531443#if ADAPTIVE_QP_SELECTION
    14541444  m_bUseAdaptQpSelect = bUseAdaptQpSelect;
     
    25382528
    25392529
    2540   if( pcCU->getSlice()->getPPS()->getSignHideFlag() && uiAbsSum>=2)
     2530  if( pcCU->getSlice()->getPPS()->getSignDataHidingEnabledFlag() && uiAbsSum>=2)
    25412531  {
    25422532    const Double inverseQuantScale = Double(g_invQuantScales[cQP.rem]);
Note: See TracChangeset for help on using the changeset viewer.