diff options
Diffstat (limited to 'software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c')
| -rw-r--r-- | software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c index 1a0f9a1..ef97dd8 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c @@ -2,7 +2,7 @@ File: oct6100_channel.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ -$Octasic_Revision: 516 $ +$Octasic_Revision: 521 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -145,7 +145,11 @@ UINT32 Oct6100ChannelOpenDef( f_pChannelOpen->VqeConfig.fRoutNoiseReduction = FALSE; f_pChannelOpen->VqeConfig.lRoutNoiseReductionLevelGainDb = -18; f_pChannelOpen->VqeConfig.fEnablePlayout = TRUE; +#ifdef cOCT6100_ADD_HUAWEI_CODE + f_pChannelOpen->VqeConfig.lAnrSnrEnhancementDb = -12; +#else f_pChannelOpen->VqeConfig.lAnrSnrEnhancementDb = -18; +#endif /* cOCT6100_ADD_HUAWEI_CODE */ f_pChannelOpen->VqeConfig.ulAnrVoiceNoiseSegregation = 6; f_pChannelOpen->VqeConfig.ulToneDisablerVqeActivationDelay = 300; f_pChannelOpen->VqeConfig.fEnableMusicProtection = FALSE; @@ -2503,7 +2507,6 @@ UINT32 Oct6100ApiUpdateChannelEntry( /* Update num active channel stats. */ if ( f_pChannelOpen->ulEchoOperationMode != cOCT6100_ECHO_OP_MODE_POWER_DOWN ) { - f_pApiInstance->pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; f_pApiInstance->pSharedInfo->MiscVars.ulNumActiveChannels++; } /*=======================================================================*/ @@ -3288,7 +3291,6 @@ UINT32 Oct6100ApiReleaseChannelResources( /* Update num active channel stats. */ if ( pChanEntry->byEchoOperationMode != cOCT6100_ECHO_OP_MODE_POWER_DOWN ) { - f_pApiInstance->pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; f_pApiInstance->pSharedInfo->MiscVars.ulNumActiveChannels--; } /*=======================================================================*/ @@ -5817,12 +5819,10 @@ UINT32 Oct6100ApiModifyChannelEntry( { if ( pChanEntry->byEchoOperationMode == cOCT6100_ECHO_OP_MODE_POWER_DOWN ) { - f_pApiInstance->pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; f_pApiInstance->pSharedInfo->MiscVars.ulNumActiveChannels++; } else if ( byOpenEchoMode == cOCT6100_ECHO_OP_MODE_POWER_DOWN ) - { - f_pApiInstance->pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; + { f_pApiInstance->pSharedInfo->MiscVars.ulNumActiveChannels--; } } @@ -8109,8 +8109,13 @@ UINT32 Oct6100ApiCheckVqeConfig( return cOCT6100_ERR_CHANNEL_ROUT_NOISE_REDUCTION_GAIN; /* Check if ANR SNRE is supported. */ +#ifdef cOCT6100_ADD_HUAWEI_CODE + if ( ( f_pVqeConfig->lAnrSnrEnhancementDb != -12 ) && ( pImageInfo->fAnrSnrEnhancement == FALSE ) ) + return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ANR_SNR_ENHANCEMENT; +#else if ( ( f_pVqeConfig->lAnrSnrEnhancementDb != -18 ) && ( pImageInfo->fAnrSnrEnhancement == FALSE ) ) return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ANR_SNR_ENHANCEMENT; +#endif cOCT6100_ADD_HUAWEI_CODE /* Validate Sout ANR SNR enhancement. */ if ( ( f_pVqeConfig->lAnrSnrEnhancementDb != -9 ) |