Changeset 1060 in 3DVCSoftware for branches/HTM-12.0-dev1/source/App/TAppEncoder/TAppEncCfg.cpp
- Timestamp:
- 7 Oct 2014, 12:16:13 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-12.0-dev1/source/App/TAppEncoder/TAppEncCfg.cpp
r1054 r1060 380 380 ("NumberOfLayers", m_numberOfLayers , 1, "Number of layers") 381 381 #if !H_3D 382 #if H_MV_HLS10_AUX 383 ("ScalabilityMask", m_scalabilityMask , 2 , "Scalability Mask: 2: Multiview, 8: Auxiliary, 10: Multiview + Auxiliary") 384 #else 382 385 ("ScalabilityMask", m_scalabilityMask , 2 , "Scalability Mask") 386 #endif 383 387 #else 384 388 ("ScalabilityMask", m_scalabilityMask , 3 , "Scalability Mask, 1: Texture 3: Texture + Depth ") … … 387 391 ("ViewOrderIndex", m_viewOrderIndex , std::vector<Int>(1,0), "View Order Index per layer") 388 392 ("ViewId", m_viewId , std::vector<Int>(1,0), "View Id per View Order Index") 393 #if H_MV_HLS10_AUX 394 ("AuxId", m_auxId , std::vector<Int>(1,0), "AuxId per layer") 395 #endif 389 396 #if H_3D 390 397 ("DepthFlag", m_depthFlag , std::vector<Int>(1,0), "Depth Flag") … … 1075 1082 } 1076 1083 m_iNumberOfViews = (Int) uniqueViewOrderIndices.size(); 1084 #if H_MV_HLS10_AUX 1085 xResizeVector( m_auxId ); 1086 #endif 1077 1087 1078 1088 #if H_3D … … 1421 1431 xConfirmPara( m_scalabilityMask != 2 && m_scalabilityMask != 3, "Scalability Mask must be equal to 2 or 3. "); 1422 1432 #else 1433 #if H_MV_HLS10_AUX 1434 xConfirmPara( m_scalabilityMask != 2 && m_scalabilityMask != 8 && m_scalabilityMask != 10, "Scalability Mask must be equal to 2, 8 or 10"); 1435 #else 1423 1436 xConfirmPara( m_scalabilityMask != 2 , "Scalability Mask must be equal to 2. "); 1437 #endif 1424 1438 #endif 1425 1439 … … 1432 1446 1433 1447 m_dimIds.push_back( m_viewOrderIndex ); 1434 xConfirmPara( m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. " ); Int dimBitOffset[MAX_NUM_SCALABILITY_TYPES+1]; 1448 #if H_MV_HLS10_AUX 1449 for (Int i = 0; i < m_auxId.size(); i++) 1450 { 1451 xConfirmPara( !( ( m_auxId[i] >= 0 && m_auxId[i] <= 2 ) || ( m_auxId[i] >= 128 && m_auxId[i] <= 159 ) ) , "AuxId shall be in the range of 0 to 2, inclusive, or 128 to 159, inclusive"); 1452 } 1453 if ( m_scalabilityMask & ( 1 << AUX_ID ) ) 1454 { 1455 m_dimIds.push_back ( m_auxId ); 1456 } 1457 #endif 1458 xConfirmPara( m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. " ); 1459 Int dimBitOffset[MAX_NUM_SCALABILITY_TYPES+1]; 1435 1460 1436 1461 dimBitOffset[ 0 ] = 0; … … 2483 2508 xPrintParaVector( "ViewIdVal" , m_viewId ); 2484 2509 xPrintParaVector( "ViewOrderIndex", m_viewOrderIndex ); 2510 #if H_MV_HLS10_AUX 2511 xPrintParaVector( "AuxId", m_auxId ); 2512 #endif 2485 2513 #endif 2486 2514 #if H_3D
Note: See TracChangeset for help on using the changeset viewer.