Changeset 1179 in 3DVCSoftware for trunk/source/App/TAppEncoder/TAppEncCfg.cpp
- Timestamp:
- 7 Apr 2015, 17:05:30 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/App/TAppEncoder/TAppEncCfg.cpp
r1133 r1179 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 4, ITU/ISO/IEC6 * Copyright (c) 2010-2015, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * … … 225 225 } 226 226 #endif 227 #if HHI_INTER_COMP_PRED_K0052 228 #if H_3D 229 in>>entry.m_interCompPredFlag; 230 #endif 231 #endif 227 232 return in; 228 233 } … … 477 482 ("FastSearch", m_iFastSearch, 1, "0:Full search 1:Diamond 2:PMVFAST") 478 483 ("SearchRange,-sr", m_iSearchRange, 96, "Motion search range") 484 #if SONY_MV_V_CONST_C0078 485 ("DispSearchRangeRestriction", m_bUseDisparitySearchRangeRestriction, false, "restrict disparity search range") 486 ("VerticalDispSearchRange", m_iVerticalDisparitySearchRange, 56, "vertical disparity search range") 487 #endif 479 488 ("BipredSearchRange", m_bipredSearchRange, 4, "Motion search range for bipred refinement") 480 489 ("HadamardME", m_bUseHADME, true, "Hadamard ME for fractional-pel") … … 785 794 ("QtPredFlag" , m_qtPredFlag , true , "Quad tree prediction from texture to depth") 786 795 ("InterSdcFlag" , m_interSdcFlag , true , "Inter depth DCs" ) 796 #if SEC_DEPTH_INTRA_SKIP_MODE_K0033 797 ("DepthIntraSkip" , m_depthIntraSkipFlag , true , "Depth intra skip mode" ) 798 #else 787 799 ("IntraSingleFlag" , m_intraSingleFlag , true , "Intra single mode" ) 800 #endif 788 801 #endif //H_3D 789 802 ; … … 1546 1559 { 1547 1560 xConfirmPara( m_directRefLayers[i][j] < 0 || m_directRefLayers[i][j] >= i , "Reference layer id shall be greater than or equal to 0 and less than dependent layer id"); 1548 xConfirmPara( m_dependencyTypes[i][j] < 0 || m_dependencyTypes[i][j] > 2 , "Dependency type shall be greater than or equal to 0 and less than 3"); 1561 #if H_3D_DIRECT_DEP_TYPE 1562 xConfirmPara( m_dependencyTypes[i][j] < 0 || m_dependencyTypes[i][j] > 6 , "Dependency type shall be greater than or equal to 0 and less than 7"); 1563 #else 1564 xConfirmPara( m_dependencyTypes[i][j] < 0 || m_dependencyTypes[i][j] > 2 , "Dependency type shall be greater than or equal to 0 and less than 3"); 1565 #endif 1549 1566 } 1550 1567 } … … 1582 1599 xConfirmPara( m_iSearchRange < 0 , "Search Range must be more than 0" ); 1583 1600 xConfirmPara( m_bipredSearchRange < 0 , "Search Range must be more than 0" ); 1601 #if SONY_MV_V_CONST_C0078 1602 xConfirmPara( m_iVerticalDisparitySearchRange <= 0 , "Vertical Disparity Search Range must be more than 0" ); 1603 #endif 1584 1604 xConfirmPara( m_iMaxDeltaQP > 7, "Absolute Delta QP exceeds supported range (0 to 7)" ); 1585 1605 xConfirmPara( m_iMaxCuDQPDepth > m_uiMaxCUDepth - 1, "Absolute depth for a minimum CuDQP exceeds maximum coding unit depth" ); … … 1697 1717 xConfirmPara( m_pchBaseViewCameraNumbers == 0 , "BaseViewCameraNumbers must be given" ); 1698 1718 #if BUG_FIX_TK65 1719 #if HHI_CAM_PARA_K0052 1720 xConfirmPara( m_iNumberOfViews != m_cCameraData.getBaseViewNumbers().size() , "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" ); 1721 #else 1699 1722 xConfirmPara( ( ((UInt) m_numberOfLayers >> 1 ) != m_cCameraData.getBaseViewNumbers().size() ) && ( m_numberOfLayers != m_cCameraData.getBaseViewNumbers().size() ), "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" ); 1723 #endif 1700 1724 #else 1701 1725 xConfirmPara( ((UInt) m_numberOfLayers >> 1 ) != m_cCameraData.getBaseViewNumbers().size(), "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" ); … … 2453 2477 printf("Min PCM size : %d\n", 1 << m_uiPCMLog2MinSize); 2454 2478 printf("Motion search range : %d\n", m_iSearchRange ); 2479 #if SONY_MV_V_CONST_C0078 2480 printf("Disp search range restriction: %d\n", m_bUseDisparitySearchRangeRestriction ); 2481 printf("Vertical disp search range : %d\n", m_iVerticalDisparitySearchRange ); 2482 #endif 2455 2483 #if H_MV 2456 2484 xPrintParaVector( "Intra period", m_iIntraPeriod ); … … 2604 2632 printf( "QtPred:%d " , m_qtPredFlag ? 1 : 0 ); 2605 2633 printf( "InterSdc:%d " , m_interSdcFlag ? 1 : 0 ); 2634 #if SEC_DEPTH_INTRA_SKIP_MODE_K0033 2635 printf( "DepthIntraSkip:%d " , m_depthIntraSkipFlag ? 1 : 0 ); 2636 #else 2606 2637 printf( "IntraSingle:%d " , m_intraSingleFlag ? 1 : 0 ); 2638 #endif 2607 2639 #endif 2608 2640
Note: See TracChangeset for help on using the changeset viewer.