Changeset 1274 in 3DVCSoftware for branches/HTM-14.1-update-dev2/source/Lib/TLibDecoder/TDecTop.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/TLibDecoder/TDecTop.cpp
r1225 r1274 292 292 293 293 294 #if H_3D_IV_MERGE294 #if NH_3D_IV_MERGE 295 295 Void 296 296 CamParsCollector::copyCamParamForSlice( TComSlice* pcSlice ) … … 1149 1149 pcSlice->getTempRefPicLists( m_cListPic, m_refPicSetInterLayer0, m_refPicSetInterLayer1, tempRefPicLists, usedAsLongTerm, numPocTotalCurr); 1150 1150 pcSlice->setRefPicList ( tempRefPicLists, usedAsLongTerm, numPocTotalCurr, true ); 1151 #if H_3D1151 #if NH_3D_NBDV 1152 1152 pcSlice->setDefaultRefView(); 1153 1153 #endif 1154 #if H_3D_ARP1154 #if NH_3D_ARP 1155 1155 pcSlice->setARPStepNum(m_ivPicLists); 1156 if( pcSlice->getARPStepNum() > 1 )1157 {1158 // GT: This seems to be broken, not all nuh_layer_ids are necessarily present1159 for(Int iLayerId = 0; iLayerId < nalu.m_nuhLayerId; iLayerId ++ )1160 {1161 Int iViewIdx = pcSlice->getVPS()->getViewIndex(iLayerId);1162 Bool bIsDepth = ( pcSlice->getVPS()->getDepthId ( iLayerId ) == 1 );1163 if( iViewIdx<getViewIndex() && !bIsDepth )1164 {1165 pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx );1166 }1167 }1168 }1169 1156 #endif 1170 1157 #else … … 1174 1161 #if NH_3D 1175 1162 pcSlice->checkInCompPredRefLayers(); 1176 #if H_3D_IV_MERGE1163 #if NH_3D_IV_MERGE 1177 1164 #if H_3D_FCO 1178 1165 //assert( !getIsDepth() ); … … 1271 1258 } 1272 1259 1273 #if H_3D_IV_MERGE1260 #if NH_3D_IV_MERGE 1274 1261 #if H_3D_FCO 1275 1262 if( !pcSlice->getIsDepth() && m_pcCamParsCollector )
Note: See TracChangeset for help on using the changeset viewer.