Changeset 704 in SHVCSoftware for branches/SHM-6-dev/source/App


Ignore:
Timestamp:
19 Apr 2014, 06:07:35 (11 years ago)
Author:
samsung
Message:

Q0200_CONFORMANCE_BL_SIZE synchronized with REPN_FORMAT_IN_VPS

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-6-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r702 r704  
    702702          }
    703703#endif
    704 #if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
     704#if REPN_FORMAT_IN_VPS
    705705          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    706706          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    … …  
    818818#endif
    819819
    820 #if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
     820#if REPN_FORMAT_IN_VPS
    821821          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    822822          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    … …  
    934934          }
    935935#endif
    936 #if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
     936#if REPN_FORMAT_IN_VPS
    937937          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    938938          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    … …  
    10521052          }
    10531053#endif
    1054 #if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
     1054#if REPN_FORMAT_IN_VPS
    10551055          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    10561056          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    … …  
    11601160    const Window &defDisp = m_respectDefDispWindow ? pic->getDefDisplayWindow() : Window();
    11611161    Int xScal =  1, yScal = 1;
    1162 #if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
     1162#if REPN_FORMAT_IN_VPS
    11631163    UInt chromaFormatIdc = pic->getSlice(0)->getChromaFormatIdc();
    11641164    xScal = TComSPS::getWinUnitX( chromaFormatIdc );
Note: See TracChangeset for help on using the changeset viewer.