Changeset 754 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
29 Apr 2014, 23:42:56 (11 years ago)
Author:
seregin
Message:

remove macro SVC_UPSAMPLING

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r749 r754  
    228228
    229229        m_cIlpPic[j] = new  TComPic;
     230
    230231#if AUXILIARY_PICTURES
    231232#if REPN_FORMAT_IN_VPS
    232 #if SVC_UPSAMPLING
    233233        m_cIlpPic[j]->create(picWidth, picHeight, slice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    234234#else
    235         m_cIlpPic[j]->create(picWidth, picHeight, slice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    236 #endif
    237 #else
    238 #if SVC_UPSAMPLING
    239235        m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), pcSPS->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    240 #else
    241         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), pcSPS->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    242 #endif
    243236#endif
    244237#else
    245238#if REPN_FORMAT_IN_VPS
    246 #if SVC_UPSAMPLING
    247239        m_cIlpPic[j]->create(picWidth, picHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    248240#else
    249         m_cIlpPic[j]->create(picWidth, picHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    250 #endif
    251 #else
    252 #if SVC_UPSAMPLING
    253241        m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    254 #else
    255         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    256 #endif
    257242#endif
    258243#endif
    … …  
    404389      }
    405390    }
    406 #endif
    407    
     391
    408392#if AUXILIARY_PICTURES
    409393#if REPN_FORMAT_IN_VPS
    410 #if SVC_UPSAMPLING
    411394    rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    412395                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    413396#else
    414     rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    415                      conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    416 #endif
    417 #else
    418 #if SVC_UPSAMPLING
    419397    rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    420398                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    421 #else
    422     rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    423                      conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    424 #endif
    425399#endif
    426400#else
    427401#if REPN_FORMAT_IN_VPS
    428 #if SVC_UPSAMPLING
    429402    rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    430403                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    431404#else
    432     rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    433                      conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    434 #endif
    435 #else
    436 #if SVC_UPSAMPLING
    437405    rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    438406                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    439 #else
     407#endif
     408#endif
     409
     410#else //SVC_EXTENSION
    440411    rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    441412                     conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    442 #endif
    443 #endif
    444 #endif
     413#endif //SVC_EXTENSION
     414   
    445415    m_cListPic.pushBack( rpcPic );
    446416   
    … …  
    481451  rpcPic->destroy();
    482452
     453#if SVC_EXTENSION
    483454#if AUXILIARY_PICTURES
    484455#if REPN_FORMAT_IN_VPS
    485 #if SVC_UPSAMPLING
    486456  rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    487457                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    488 
    489 #else
    490   rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    491                    conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    492 #endif
    493 #else
    494 #if SVC_UPSAMPLING
     458#else
    495459  rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    496460                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    497 
    498 #else
    499   rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    500                    conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    501 #endif
    502461#endif
    503462#else
    504463#if REPN_FORMAT_IN_VPS
    505 #if SVC_UPSAMPLING
    506464  rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    507465                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    508466
    509467#else
    510   rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    511                    conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    512 #endif
    513 #else
    514 #if SVC_UPSAMPLING
    515468  rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    516469                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    517 
    518 #else
     470#endif
     471#endif
     472#else  //SVC_EXTENSION
    519473  rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    520474                   conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    521 #endif
    522 #endif
    523 #endif
     475#endif //SVC_EXTENSION
    524476}
    525477
    … …  
    796748
    797749#if AUXILIARY_PICTURES
    798 #if SVC_UPSAMPLING
    799750#if AVC_SYNTAX
    800751      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, activeSPS, true);
    … …  
    803754#endif
    804755#else
    805       pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, true);
    806 #endif
    807 #else
    808 #if SVC_UPSAMPLING
    809756#if AVC_SYNTAX
    810757      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, activeSPS, true);
    811758#else
    812759      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true);
    813 #endif
    814 #else
    815       pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), onformanceWindow, defaultDisplayWindow, numReorderPics, true);
    816760#endif
    817761#endif
    … …  
    16951639        }
    16961640#endif
    1697 #if SVC_UPSAMPLING
     1641#if SVC_EXTENSION
    16981642        if( pcPic->isSpatialEnhLayer(refLayerIdc) )
    16991643        {
    … …  
    17371681        }
    17381682        pcSlice->setFullPelBaseRec ( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc) );
    1739 #endif
     1683#endif //SVC_EXTENSION
    17401684      }
    17411685    }
Note: See TracChangeset for help on using the changeset viewer.