Changeset 606 in 3DVCSoftware for branches/HTM-DEV-2.0-Renderer-Fix/source/Lib/TAppCommon
- Timestamp:
- 31 Aug 2013, 22:32:03 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-2.0-Renderer-Fix/source/Lib/TAppCommon/TAppComCamPara.cpp
r542 r606 616 616 { 617 617 UInt uiFoundLine = -1; 618 #if H_3D_FIX_REN_WARNING 619 if ( !xGetCameraDataRow( iView, uiFrame, uiFoundLine ) && xIsIn( m_aiSortedBaseViews, iView )) 620 #else 618 621 if ( !xGetCameraDataRow( iView, uiFrame, uiFoundLine ) ) 622 #endif 619 623 { 620 624 AOT( m_aadCameraParameters[ uiFoundLine ].size() < 6 ); … … 632 636 Int iDummy; 633 637 638 #if H_3D_FIX_REN_WARNING 639 if( !xGetLeftRightView( iView, m_aiSortedBaseViews, iLeftView, iRightView, iDummy, iDummy ) || 640 #else 634 641 if( !xGetLeftRightView( iView, m_aiViewsInCfgFile, iLeftView, iRightView, iDummy, iDummy ) || 642 #endif 635 643 xGetCameraDataRow( iLeftView, uiFrame, uiLeftViewLine ) || 636 644 xGetCameraDataRow( iRightView, uiFrame, uiRightViewLine ) 637 645 ) 638 646 { 647 #if H_3D_FIX_REN_WARNING 648 std::cerr << "No left or no right base view next to view " << (Double)iView / m_dViewNumPrec << " for Frame " << uiFrame << " given in CameraParameterFile" << std::endl; 649 #else 639 650 std::cerr << "No Left or no Right View next to View " << (Double)iView / m_dViewNumPrec << " for Frame " << uiFrame << " given in CameraParameterFile" << std::endl; 651 #endif 640 652 AOT(true); 641 653 exit( EXIT_FAILURE ); … … 892 904 893 905 // maximum deviation 906 #if H_3D_REN_MAX_DEV_OUT 907 m_dMaxShiftDeviation = std::max( m_dMaxShiftDeviation, fabs( Double( (Int) iShiftLuma ) - dShiftLuma ) / Double( 1 << m_iLog2Precision ) ); 908 #endif 894 909 dMaxDispDev = std::max( dMaxDispDev, fabs( Double( (Int) iTestScale ) - dShiftLuma * Double( 1 << iLog2DivLuma ) ) / Double( 1 << iLog2DivLuma ) ); 895 910 dMaxRndDispDvL = std::max( dMaxRndDispDvL, fabs( Double( (Int) iShiftLuma ) - dShiftLuma ) ); … … 1026 1041 m_bCamParsCodedPrecSet = false; 1027 1042 1043 #if H_3D_REN_MAX_DEV_OUT 1044 m_dMaxShiftDeviation = -1; 1045 #endif 1028 1046 1029 1047 } … … 1334 1352 } 1335 1353 } 1354 #if H_3D_FIX_REN_WARNING 1355 Bool bIgnoreFirst = true; 1356 for( UInt uiERView = 0; uiERView < m_aiSynthViews.size() && !m_bSetupFromCoded; uiERView++ ) 1357 { 1358 if ( xIsIn(m_aiViewsInCfgFile, m_aiSynthViews[ uiERView ] ) ) 1359 { 1360 if ( bIgnoreFirst ) 1361 { 1362 std::cout << "Ignoring CameraParameterFile entries for virtual view(s): " ; 1363 //GT: Integer precision virtual view camera parameters are always interpolated from coded views camera parameters. 1364 bIgnoreFirst = false; 1365 } 1366 std::cout << (Double)m_aiSynthViews[ uiERView ] / m_dViewNumPrec << " " ; 1367 } 1368 } 1369 if ( !bIgnoreFirst ) 1370 { 1371 std::cout << std::endl; 1372 } 1373 #endif 1336 1374 1337 1375 Bool bInterpolateFirst = true; … … 1352 1390 if ( bInterpolateFirst ) 1353 1391 { 1392 #if H_3D_FIX_REN_WARNING 1393 std::cout << "Interpolating camera parameters for virtual view(s): " ; 1394 #else 1354 1395 std::cout << "Interpolating Camera Parameters for View(s) " ; 1396 #endif 1355 1397 bInterpolateFirst = false; 1356 1398 } … … 1456 1498 } 1457 1499 1500 #if H_3D_FIX_REN_WARNING 1501 Bool 1502 TAppComCamPara::xIsIn( std::vector<Int>& rVec, Int iElem) 1503 { 1504 Bool bFound = false; 1505 for (Int idx = 0; idx < rVec.size() && !bFound; idx++) 1506 { 1507 bFound = bFound || rVec[idx] == iElem; 1508 } 1509 return bFound; 1510 } 1511 #endif 1512 1458 1513 Int TAppComCamPara::getRelDistLeft( Int iSynthViewIdx, Int iLeftViewIdx, Int iRightViewIdx ) 1459 1514 {
Note: See TracChangeset for help on using the changeset viewer.