Changeset 443 in 3DVCSoftware for trunk/source/App/TAppEncoder/TAppEncCfg.cpp
- Timestamp:
- 26 May 2013, 15:41:34 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/App/TAppEncoder/TAppEncCfg.cpp
r332 r443 383 383 #endif 384 384 #if H3D_IVRP 385 #if QC_ARP_D0177 386 ("MultiviewResPred", m_nUseAdvResPred, (UInt)0, "usage of Advanced residual prediction" ) 387 #else 385 388 ("MultiviewResPred", m_uiMultiviewResPredMode, (UInt)0, "usage of inter-view residual prediction" ) 389 #endif 390 #endif 391 #if MTK_D0156 392 ("UseVSPCompensation", m_bUseVSPCompensation, true, "Depth dependent tools: BVSP" ) 393 ("UseDVPRefine", m_bUseDVPRefine, true, "Depth dependent tools: DoNBDV" ) 386 394 #endif 387 395 … … 392 400 ("SAO", m_abUseSAO, std::vector<Bool>(1, true), "SAO") 393 401 ("MaxNumOffsetsPerPic", m_maxNumOffsetsPerPic, 2048, "2048: default") 402 #if LGE_SAO_MIGRATION_D0091 403 ("SAOLcuBoundary", m_saoLcuBoundary, false, "0: right/bottom LCU boundary areas skipped from SAO parameter estimation, 1: non-deblocked pixels are used for those areas") 404 ("SAOLcuBasedOptimization", m_saoLcuBasedOptimization, true, "0: SAO picture-based optimization, 1: SAO LCU-based optimization ") 405 #else 394 406 ("SAOInterleaving", m_saoInterleavingFlag, false, "0: SAO Picture Mode, 1: SAO Interleaving ") 407 #endif 395 408 396 409 ("ALFEncodePassReduction", m_iALFEncodePassReduction, 0, "0:Original 16-pass, 1: 1-pass, 2: 2-pass encoding") … … 917 930 #endif 918 931 #if H3D_IVRP 932 #if QC_ARP_D0177 933 #if QC_ARP_WARNING_FIX 934 xConfirmPara ( m_nUseAdvResPred > 1 , "0<=ARP<=1" ); 935 #else 936 xConfirmPara ( m_nUseAdvResPred < 0 || m_nUseAdvResPred > 1 , "0<=ARP<=1" ); 937 #endif 938 #else 919 939 xConfirmPara ( m_uiMultiviewResPredMode > 1, "MultiviewResPred must be less than or equal to 1" ); 920 940 xConfirmPara ( m_uiMultiviewResPredMode > 0 && m_uiPredDepthMapGeneration == 0 , "MultiviewResPred > 0 requires PredDepthMapGen > 0" ); 941 #endif 921 942 #endif 922 943 if( m_bUsingDepthMaps ) … … 1625 1646 printf("CIP:%d ", m_bUseConstrainedIntraPred); 1626 1647 printf("PCM:%d ", (m_usePCM && (1<<m_uiPCMLog2MinSize) <= m_uiMaxCUWidth)? 1 : 0); 1648 #if LGE_SAO_MIGRATION_D0091 1649 printf("SAOLcuBasedOptimization:%d ", (m_saoLcuBasedOptimization)?(1):(0)); 1650 #else 1627 1651 printf("SAOInterleaving:%d ", (m_saoInterleavingFlag)?(1):(0)); 1652 #endif 1628 1653 #if LOSSLESS_CODING 1629 1654 printf("LosslessCuEnabled:%d ", (m_useLossless)? 1:0 ); … … 1672 1697 printf("IVSEnable: %d ", m_bUseIVS); 1673 1698 #endif 1699 #if QC_ARP_D0177 1700 printf(" ARP:%d " , m_nUseAdvResPred ); 1701 #endif 1674 1702 printf("\n"); 1675 1703 … … 1708 1736 printf("DLT:%d ", m_bUseDLT ? 1 : 0 ); 1709 1737 #endif 1738 1739 #if MTK_D0156 1740 printf("BVSP:%d ", m_bUseVSPCompensation ? 1 : 0 ); 1741 printf("DoNBDV:%d ", m_bUseDVPRefine ? 1 : 0 ); 1742 #endif 1743 1710 1744 #if LGE_WVSO_A0119 1711 1745 if ( m_bUseWVSO )
Note: See TracChangeset for help on using the changeset viewer.