Changeset 1166 in 3DVCSoftware for branches/HTM-13.1-dev0/source/App/TAppEncoder


Ignore:
Timestamp:
16 Mar 2015, 13:37:35 (10 years ago)
Author:
tech
Message:

Fixed erroneous #ifdefs.

Location:
branches/HTM-13.1-dev0/source/App/TAppEncoder
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-13.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

    r1164 r1166  
    477477  ("FastSearch",              m_iFastSearch,                1, "0:Full search  1:Diamond  2:PMVFAST")
    478478  ("SearchRange,-sr",         m_iSearchRange,              96, "Motion search range")
    479 #ifdef SONY_MV_V_CONST_C0078
     479#if SONY_MV_V_CONST_C0078
    480480  ("DispSearchRangeRestriction",  m_bUseDisparitySearchRangeRestriction, false, "restrict disparity search range")
    481481  ("VerticalDispSearchRange",     m_iVerticalDisparitySearchRange, 56, "vertical disparity search range")
    … …  
    15901590  xConfirmPara( m_iSearchRange < 0 ,                                                        "Search Range must be more than 0" );
    15911591  xConfirmPara( m_bipredSearchRange < 0 ,                                                   "Search Range must be more than 0" );
    1592 #ifdef SONY_MV_V_CONST_C0078
     1592#if SONY_MV_V_CONST_C0078
    15931593  xConfirmPara( m_iVerticalDisparitySearchRange <= 0 ,                                      "Vertical Disparity Search Range must be more than 0" );
    15941594#endif
    … …  
    24642464  printf("Min PCM size                 : %d\n", 1 << m_uiPCMLog2MinSize);
    24652465  printf("Motion search range          : %d\n", m_iSearchRange );
    2466 #ifdef SONY_MV_V_CONST_C0078
     2466#if SONY_MV_V_CONST_C0078
    24672467  printf("Disp search range restriction: %d\n", m_bUseDisparitySearchRangeRestriction );
    24682468  printf("Vertical disp search range   : %d\n", m_iVerticalDisparitySearchRange );

  • branches/HTM-13.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

    r1164 r1166  
    289289  Int       m_iSearchRange;                                   ///< ME search range
    290290  Int       m_bipredSearchRange;                              ///< ME search range for bipred refinement
    291 #ifdef SONY_MV_V_CONST_C0078
     291#if SONY_MV_V_CONST_C0078
    292292  Bool      m_bUseDisparitySearchRangeRestriction;            ///< restrict vertical search range for inter-view prediction
    293293  Int       m_iVerticalDisparitySearchRange;                  ///< ME vertical search range for inter-view prediction
Note: See TracChangeset for help on using the changeset viewer.