Changeset 150 in SHVCSoftware for branches/SHM-2.0-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
4 May 2013, 00:13:37 (12 years ago)
Author:
seregin
Message:

compile error fox AVC_SYNTAX

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-2.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r137 r150  
    143143  if(m_layerId>0)
    144144  {
     145    g_bitDepthY     = pcSPS->getBitDepthY();
     146    g_bitDepthC     = pcSPS->getBitDepthC();
     147    g_uiMaxCUWidth  = pcSPS->getMaxCUWidth();
     148    g_uiMaxCUHeight = pcSPS->getMaxCUHeight();
     149    g_uiMaxCUDepth  = pcSPS->getMaxCUDepth();
     150    g_uiAddCUDepth  = max (0, pcSPS->getLog2MinCodingBlockSize() - (Int)pcSPS->getQuadtreeTULog2MinSize() );
     151
    145152    Int  numReorderPics[MAX_TLAYER];
    146153    Window &conformanceWindow = pcSPS->getConformanceWindow();
     
    579586    fstream* pFile  = m_ppcTDecTop[0]->getBLReconFile();
    580587    const Window &conf = pBLPic->getConformanceWindow();
     588#if ILP_DECODED_PICTURE
     589    UInt uiWidth    = pBLPic->getPicYuvRec()->getWidth();
     590    UInt uiHeight   = pBLPic->getPicYuvRec()->getHeight();
     591#else
    581592    UInt uiWidth    = pBLPic->getPicYuvRec()->getWidth() - conf.getWindowLeftOffset() - conf.getWindowRightOffset();
    582593    UInt uiHeight   = pBLPic->getPicYuvRec()->getHeight() - conf.getWindowTopOffset() - conf.getWindowBottomOffset();
     594#endif
    583595       
    584596    if( pFile->good() )
     
    10821094#if AVC_SYNTAX
    10831095
    1084           pBLPic->create( m_ppcTDecTop[0]->getBLWidth(), m_ppcTDecTop[0]->getBLHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, sps, true);
    1085 #else
    1086           pBLPic->create( m_ppcTDecTop[0]->getBLWidth(), m_ppcTDecTop[0]->getBLHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true);
    1087 #endif
    1088 #else
    1089           pBLPic->create( m_ppcTDecTop[0]->getBLWidth(), m_ppcTDecTop[0]->getBLHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, onformanceWindow, defaultDisplayWindow, numReorderPics, true);
     1096          pBLPic->create( m_ppcTDecTop[0]->getBLWidth(), m_ppcTDecTop[0]->getBLHeight(), sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, sps, true);
     1097#else
     1098          pBLPic->create( m_ppcTDecTop[0]->getBLWidth(), m_ppcTDecTop[0]->getBLHeight(), sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true);
     1099#endif
     1100#else
     1101          pBLPic->create( m_ppcTDecTop[0]->getBLWidth(), m_ppcTDecTop[0]->getBLHeight(), sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth(), onformanceWindow, defaultDisplayWindow, numReorderPics, true);
    10901102#endif
    10911103        }
Note: See TracChangeset for help on using the changeset viewer.