Index: /branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp =================================================================== --- /branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (revision 1405) +++ /branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (revision 1406) @@ -977,4 +977,5 @@ Int tmpWeightedPredictionMethod; Int tmpFastInterSearchMode; + Int tmpMotionEstimationSearchMethod; string inputColourSpaceConvert; #if SVC_EXTENSION @@ -1283,5 +1284,5 @@ // motion search options ("DisableIntraInInter", m_bDisableIntraPUsInInterSlices, false, "Flag to disable intra PUs in inter slices") - ("FastSearch", m_iFastSearch, 1, "0:Full search 1:Diamond 2:PMVFAST") + ("FastSearch", tmpMotionEstimationSearchMethod, Int(MESEARCH_DIAMOND), "0:Full search 1:Diamond 2:Selective") ("SearchRange,-sr", m_iSearchRange, 96, "Motion search range") ("BipredSearchRange", m_bipredSearchRange, 4, "Motion search range for bipred refinement") @@ -2045,4 +2046,11 @@ m_fastInterSearchMode = FastInterSearchMode(tmpFastInterSearchMode); + assert(tmpMotionEstimationSearchMethod>=0 && tmpMotionEstimationSearchMethod=MESEARCH_NUMBER_OF_METHODS) + { + exit(EXIT_FAILURE); + } + m_motionEstimationSearchMethod=MESearchMethod(tmpMotionEstimationSearchMethod); + #if !SVC_EXTENSION if (extendedProfile >= 1000 && extendedProfile <= 12316) @@ -3220,5 +3228,4 @@ xConfirmPara( m_loopFilterBetaOffsetDiv2 < -6 || m_loopFilterBetaOffsetDiv2 > 6, "Loop Filter Beta Offset div. 2 exceeds supported range (-6 to 6)"); xConfirmPara( m_loopFilterTcOffsetDiv2 < -6 || m_loopFilterTcOffsetDiv2 > 6, "Loop Filter Tc Offset div. 2 exceeds supported range (-6 to 6)"); - xConfirmPara( m_iFastSearch < 0 || m_iFastSearch > 2, "Fast Search Mode is not supported value (0:Full search 1:Diamond 2:PMVFAST)" ); xConfirmPara( m_iSearchRange < 0 , "Search Range must be more than 0" ); xConfirmPara( m_bipredSearchRange < 0 , "Bi-prediction refinement search range must be more than 0" ); Index: /branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h =================================================================== --- /branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h (revision 1405) +++ /branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h (revision 1406) @@ -286,5 +286,5 @@ Int m_rdPenalty; ///< RD-penalty for 32x32 TU for intra in non-intra slices (0: no RD-penalty, 1: RD-penalty, 2: maximum RD-penalty) Bool m_bDisableIntraPUsInInterSlices; ///< Flag for disabling intra predicted PUs in inter slices. - Int m_iFastSearch; ///< ME mode, 0 = full, 1 = diamond, 2 = PMVFAST + MESearchMethod m_motionEstimationSearchMethod; Bool m_bRestrictMESampling; ///< Restrict sampling for the Selective ME Int m_iSearchRange; ///< ME search range Index: /branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp =================================================================== --- /branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (revision 1405) +++ /branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (revision 1406) @@ -562,5 +562,5 @@ //====== Motion search ======== m_cTEncTop.setDisableIntraPUsInInterSlices ( m_bDisableIntraPUsInInterSlices ); - m_cTEncTop.setFastSearch ( m_iFastSearch ); + m_cTEncTop.setMotionEstimationSearchMethod ( m_motionEstimationSearchMethod ); m_cTEncTop.setSearchRange ( m_iSearchRange ); m_cTEncTop.setBipredSearchRange ( m_bipredSearchRange ); Index: /branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h (revision 1405) +++ /branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h (revision 1406) @@ -505,7 +505,8 @@ enum MESearchMethod { - FULL_SEARCH = 0, ///< Full search - DIAMOND = 1, ///< Fast search - SELECTIVE = 2 ///< Selective search + MESEARCH_FULL = 0, + MESEARCH_DIAMOND = 1, + MESEARCH_SELECTIVE = 2, + MESEARCH_NUMBER_OF_METHODS = 3 }; Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (revision 1405) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (revision 1406) @@ -175,5 +175,5 @@ //====== Motion search ======== Bool m_bDisableIntraPUsInInterSlices; - Int m_iFastSearch; // 0:Full search 1:Diamond 2:PMVFAST + MESearchMethod m_motionEstimationSearchMethod; Int m_iSearchRange; // 0:Full frame Int m_bipredSearchRange; @@ -563,5 +563,5 @@ //====== Motion search ======== Void setDisableIntraPUsInInterSlices ( Bool b ) { m_bDisableIntraPUsInInterSlices = b; } - Void setFastSearch ( Int i ) { m_iFastSearch = i; } + Void setMotionEstimationSearchMethod ( MESearchMethod e ) { m_motionEstimationSearchMethod = e; } Void setSearchRange ( Int i ) { m_iSearchRange = i; } Void setBipredSearchRange ( Int i ) { m_bipredSearchRange = i; } @@ -638,5 +638,5 @@ //==== Motion search ======== Bool getDisableIntraPUsInInterSlices () const { return m_bDisableIntraPUsInInterSlices; } - Int getFastSearch () const { return m_iFastSearch; } + MESearchMethod getMotionEstimationSearchMethod ( ) const { return m_motionEstimationSearchMethod; } Int getSearchRange () const { return m_iSearchRange; } Bool getClipForBiPredMeEnabled () const { return m_bClipForBiPredMeEnabled; } Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp (revision 1405) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp (revision 1406) @@ -1411,5 +1411,5 @@ *earlyDetectionSkipMode = true; } - else if(m_pcEncCfg->getFastSearch() != SELECTIVE) + else if(m_pcEncCfg->getMotionEstimationSearchMethod() != MESEARCH_SELECTIVE) { Int absoulte_MV=0; Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 1405) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 1406) @@ -121,5 +121,5 @@ , m_iSearchRange (0) , m_bipredSearchRange (0) -, m_iFastSearch (0) +, m_motionEstimationSearchMethod (MESEARCH_FULL) , m_pppcRDSbacCoder (NULL) , m_pcRDGoOnSbacCoder (NULL) @@ -226,29 +226,29 @@ -Void TEncSearch::init(TEncCfg* pcEncCfg, - TComTrQuant* pcTrQuant, - Int iSearchRange, - Int bipredSearchRange, - Int iFastSearch, - const UInt maxCUWidth, - const UInt maxCUHeight, - const UInt maxTotalCUDepth, - TEncEntropy* pcEntropyCoder, - TComRdCost* pcRdCost, - TEncSbac*** pppcRDSbacCoder, - TEncSbac* pcRDGoOnSbacCoder +Void TEncSearch::init(TEncCfg* pcEncCfg, + TComTrQuant* pcTrQuant, + Int iSearchRange, + Int bipredSearchRange, + MESearchMethod motionEstimationSearchMethod, + const UInt maxCUWidth, + const UInt maxCUHeight, + const UInt maxTotalCUDepth, + TEncEntropy* pcEntropyCoder, + TComRdCost* pcRdCost, + TEncSbac*** pppcRDSbacCoder, + TEncSbac* pcRDGoOnSbacCoder ) { assert (!m_isInitialized); - m_pcEncCfg = pcEncCfg; - m_pcTrQuant = pcTrQuant; - m_iSearchRange = iSearchRange; - m_bipredSearchRange = bipredSearchRange; - m_iFastSearch = iFastSearch; - m_pcEntropyCoder = pcEntropyCoder; - m_pcRdCost = pcRdCost; - - m_pppcRDSbacCoder = pppcRDSbacCoder; - m_pcRDGoOnSbacCoder = pcRDGoOnSbacCoder; + m_pcEncCfg = pcEncCfg; + m_pcTrQuant = pcTrQuant; + m_iSearchRange = iSearchRange; + m_bipredSearchRange = bipredSearchRange; + m_motionEstimationSearchMethod = motionEstimationSearchMethod; + m_pcEntropyCoder = pcEntropyCoder; + m_pcRdCost = pcRdCost; + + m_pppcRDSbacCoder = pppcRDSbacCoder; + m_pcRDGoOnSbacCoder = pcRDGoOnSbacCoder; for (UInt iDir = 0; iDir < MAX_NUM_REF_LIST_ADAPT_SR; iDir++) @@ -340,5 +340,5 @@ m_cDistParam.m_maximumDistortionForEarlyExit = rcStruct.uiBestSad; - if((m_pcEncCfg->getRestrictMESampling() == false) && m_pcEncCfg->getFastSearch() == SELECTIVE) + if((m_pcEncCfg->getRestrictMESampling() == false) && m_pcEncCfg->getMotionEstimationSearchMethod() == MESEARCH_SELECTIVE) { Int isubShift = 0; @@ -3912,5 +3912,5 @@ #endif - if ( !m_iFastSearch || bBi ) + if ( (m_motionEstimationSearchMethod==MESEARCH_FULL) || bBi ) { xPatternSearch ( pcPatternKey, piRefY, iRefStride, &cMvSrchRngLT, &cMvSrchRngRB, rcMv, ruiCost ); @@ -4066,13 +4066,15 @@ pcCU->getMvPredAboveRight ( m_acMvPredictors[MD_ABOVE_RIGHT] ); - switch ( m_iFastSearch ) - { - case 1: + switch ( m_motionEstimationSearchMethod ) + { + case MESEARCH_DIAMOND: xTZSearch( pcCU, pcPatternKey, piRefY, iRefStride, pcMvSrchRngLT, pcMvSrchRngRB, rcMv, ruiSAD, pIntegerMv2Nx2NPred ); break; - case 2: + case MESEARCH_SELECTIVE: xTZSearchSelective( pcCU, pcPatternKey, piRefY, iRefStride, pcMvSrchRngLT, pcMvSrchRngRB, rcMv, ruiSAD, pIntegerMv2Nx2NPred ); break; + + case MESEARCH_FULL: // shouldn't get here. default: break; Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.h (revision 1405) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.h (revision 1406) @@ -102,5 +102,5 @@ Int m_iSearchRange; Int m_bipredSearchRange; // Search range for bi-prediction - Int m_iFastSearch; + MESearchMethod m_motionEstimationSearchMethod; Int m_aaiAdaptSR[MAX_NUM_REF_LIST_ADAPT_SR][MAX_IDX_ADAPT_SR]; TComMv m_cSrchRngLT; @@ -125,8 +125,6 @@ Bool m_isInitialized; -#if SVC_EXTENSION -#if N0383_IL_CONSTRAINED_TILE_SETS_SEI +#if SVC_EXTENSION && N0383_IL_CONSTRAINED_TILE_SETS_SEI Bool m_disableILP; -#endif #endif @@ -135,16 +133,16 @@ virtual ~TEncSearch(); - Void init(TEncCfg* pcEncCfg, - TComTrQuant* pcTrQuant, - Int iSearchRange, - Int bipredSearchRange, - Int iFastSearch, - const UInt maxCUWidth, - const UInt maxCUHeight, - const UInt maxTotalCUDepth, - TEncEntropy* pcEntropyCoder, - TComRdCost* pcRdCost, - TEncSbac*** pppcRDSbacCoder, - TEncSbac* pcRDGoOnSbacCoder ); + Void init(TEncCfg* pcEncCfg, + TComTrQuant* pcTrQuant, + Int iSearchRange, + Int bipredSearchRange, + MESearchMethod motionEstimationSearchMethod, + const UInt maxCUWidth, + const UInt maxCUHeight, + const UInt maxTotalCUDepth, + TEncEntropy* pcEntropyCoder, + TComRdCost* pcRdCost, + TEncSbac*** pppcRDSbacCoder, + TEncSbac* pcRDGoOnSbacCoder ); Void destroy(); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1405) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1406) @@ -258,5 +258,5 @@ // initialize encoder search class - m_cSearch.init( this, &m_cTrQuant, m_iSearchRange, m_bipredSearchRange, m_iFastSearch, m_maxCUWidth, m_maxCUHeight, m_maxTotalCUDepth, &m_cEntropyCoder, &m_cRdCost, getRDSbacCoder(), getRDGoOnSbacCoder() ); + m_cSearch.init( this, &m_cTrQuant, m_iSearchRange, m_bipredSearchRange, m_motionEstimationSearchMethod, m_maxCUWidth, m_maxCUHeight, m_maxTotalCUDepth, &m_cEntropyCoder, &m_cRdCost, getRDSbacCoder(), getRDGoOnSbacCoder() ); m_iMaxRefPicNum = 0;