Changeset 1274 in 3DVCSoftware for branches/HTM-14.1-update-dev2/source/Lib/TLibEncoder/TEncGOP.cpp
- Timestamp:
- 14 Jul 2015, 12:31:09 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev2/source/Lib/TLibEncoder/TEncGOP.cpp
r1225 r1274 1443 1443 } 1444 1444 1445 #if H_3D_IV_MERGE1445 #if NH_3D_IV_MERGE 1446 1446 // This needs to be done after initialization of 3D tool parameters. 1447 1447 pcSlice->setMaxNumMergeCand ( m_pcCfg->getMaxNumMergeCand() + ( ( pcSlice->getMpiFlag( ) || pcSlice->getIvMvPredFlag( ) || pcSlice->getViewSynthesisPredFlag( ) ) ? 1 : 0 )); … … 1471 1471 pcSlice->setRefPicList ( rcListPic ); 1472 1472 #endif 1473 #if H_3D1473 #if NH_3D_NBDV 1474 1474 pcSlice->setDefaultRefView(); 1475 1475 #endif 1476 #if H_3D_ARP1476 #if NH_3D_ARP 1477 1477 //GT: This seems to be broken when layerId in vps is not equal to layerId in nuh 1478 1478 pcSlice->setARPStepNum(m_ivPicLists); 1479 if(pcSlice->getARPStepNum() > 1)1480 {1481 for(Int iLayerId = 0; iLayerId < getLayerId(); iLayerId ++ )1482 {1483 Int iViewIdx = pcSlice->getVPS()->getViewIndex(iLayerId);1484 Bool bIsDepth = ( pcSlice->getVPS()->getDepthId ( iLayerId ) == 1 );1485 if( iViewIdx<getViewIndex() && !bIsDepth )1486 {1487 pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx );1488 }1489 }1490 }1491 1479 #endif 1492 1480 #if NH_3D_IC … … 1731 1719 UInt uiNumSliceSegments = 1; 1732 1720 1733 #if H_3D_NBDV1721 #if NH_3D_NBDV 1734 1722 if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done. 1735 1723 { 1736 Int iColPoc = pcSlice->getRefPOC(RefPicList(1 -pcSlice->getColFromL0Flag()), pcSlice->getColRefIdx());1724 Int iColPoc = pcSlice->getRefPOC(RefPicList(1 - pcSlice->getColFromL0Flag()), pcSlice->getColRefIdx()); 1737 1725 pcPic->setNumDdvCandPics(pcPic->getDisCandRefPictures(iColPoc)); 1738 1726 } … … 1743 1731 #endif 1744 1732 1745 #if H_3D_NBDV1733 #if NH_3D_NBDV 1746 1734 if(pcSlice->getViewIndex() && !pcSlice->getIsDepth() && !pcSlice->isIntra()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done. 1747 1735 {
Note: See TracChangeset for help on using the changeset viewer.