Changeset 683 in SHVCSoftware


Ignore:
Timestamp:
16 Apr 2014, 01:40:04 (11 years ago)
Author:
qualcomm
Message:

minor cleaning

Location:
branches/SHM-6-dev/source/Lib
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-6-dev/source/Lib/TLibCommon/TypeDef.h

    r677 r683  
    8686#define O0194_JOINT_US_BITSHIFT          1      ///< JCTVC-O0194: Joint Upsampling and bit-shift
    8787#endif
    88 #define Q0048_CGS_3D_ASYMLUT                   1
     88#define Q0048_CGS_3D_ASYMLUT             1
    8989#if Q0048_CGS_3D_ASYMLUT
    90 #define Q0048_CGS_3D_ASYMLUT_OFF               0
    91 #define Q0048_CGS_3D_ASYMLUT_PPSUPDATE         1
    9290#define O0194_WEIGHTED_PREDICTION_CGS    0
    9391#else
  • TabularUnified branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r677 r683  
    358358      READ_FLAG( uiCode , "colour_mapping_enabled_flag" );
    359359      pcPPS->setCGSFlag( uiCode );
    360       if( pcPPS->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE )
     360      if( pcPPS->getCGSFlag() )
    361361      {
    362362        xParse3DAsymLUT( pc3DAsymLUT );
  • TabularUnified branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r677 r683  
    15501550#if Q0048_CGS_3D_ASYMLUT
    15511551        TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
    1552         if( pcSlice->getPPS()->getCGSFlag() != Q0048_CGS_3D_ASYMLUT_OFF )
     1552        if( pcSlice->getPPS()->getCGSFlag() )
    15531553        {
    15541554          if(!m_pColorMappedPic)
  • TabularUnified branches/SHM-6-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp

    r678 r683  
    390390  if( pSlice->getBaseColPic( pSlice->getInterLayerPredLayerIdc( 0 ) )->getSlice( 0 )->isIntra() )
    391391    nPartNumLog2 = xGetMaxPartNumLog2();
    392   if( m_nPrevFrameBit[nSliceType][nSliceTempLevel] && pSlice->getPPS()->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE  )
     392  if( m_nPrevFrameBit[nSliceType][nSliceTempLevel] && pSlice->getPPS()->getCGSFlag() )
    393393  {
    394394    Double dBitCost = 1.0 * m_nPrevFrameCGSBit[nSliceType][nSliceTempLevel] / m_nPrevFrameBit[nSliceType][nSliceTempLevel];
  • TabularUnified branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r677 r683  
    275275      UInt uiPos = getNumberOfWrittenBits();
    276276      WRITE_FLAG( pcPPS->getCGSFlag() , "colour_mapping_enabled_flag" );
    277       if( pcPPS->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE )
     277      if( pcPPS->getCGSFlag() )
    278278      {
    279279        assert( pc3DAsymLUT != NULL );
  • TabularUnified branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r678 r683  
    955955#if Q0048_CGS_3D_ASYMLUT
    956956        TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
    957         if( pcSlice->getPPS()->getCGSFlag() != Q0048_CGS_3D_ASYMLUT_OFF)
     957        if( pcSlice->getPPS()->getCGSFlag() )
    958958        {
    959959          if(g_posScalingFactor[refLayerIdc][0] < (1<<16) || g_posScalingFactor[refLayerIdc][1] < (1<<16)) //if(pcPic->isSpatialEnhLayer(refLayerIdc))
     
    19961996    }
    19971997#if Q0048_CGS_3D_ASYMLUT
    1998     else if( m_pcCfg->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE && pcSlice->getLayerId() && pcSlice->getCGSOverWritePPS() )
     1998    else if( m_pcCfg->getCGSFlag() && pcSlice->getLayerId() && pcSlice->getCGSOverWritePPS() )
    19991999    {
    20002000#if SVC_EXTENSION
     
    41534153    pSlice->setCGSOverWritePPS( 1 ); // regular PPS update
    41544154  }
    4155   else if( nCGSFlag == Q0048_CGS_3D_ASYMLUT_PPSUPDATE )
     4155  else if( nCGSFlag )
    41564156  {
    41574157    dErrorPPS = m_Enc3DAsymLUTPPS.estimateDistWithCur3DAsymLUT( pCurPic , refLayerIdc );
Note: See TracChangeset for help on using the changeset viewer.