diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-04-20 16:28:58 -0700 | 
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-04-20 16:28:58 -0700 | 
| commit | 28935a8b6435eaf41ab13605097257c9d7f5afda (patch) | |
| tree | a14e8ddc954805ce4395c386275f8c3349226e2d | |
| parent | 6e7b0fc8823118127b3d182bbe13c43304f918b1 (diff) | |
Move location where we call function to setup VAD but didn't help
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 26 | 
1 files changed, 14 insertions, 12 deletions
| diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 39d6868b5c..fa4504de62 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -683,7 +683,14 @@ void LLVivoxVoiceClient::voiceControlCoro()          bool success = startAndConnectSession();          if (success)          { -            if (mTuningMode) +			// disable the automatic VAD and explicitly set the VAD variables ourselves +			// see SL-15072 for more details +			unsigned int vad_hangover = 2001; +			unsigned int vad_noise_floor = 577; +			unsigned int vad_sensitivity = 44; +			setupVADParams(vad_hangover, vad_noise_floor, vad_sensitivity); +			 +			if (mTuningMode)              {                  performMicTuning();              } @@ -1883,13 +1890,6 @@ bool LLVivoxVoiceClient::runSession(const sessionStatePtr_t &session)      notifyParticipantObservers();      notifyVoiceFontObservers(); -	// disable the automatic VAD and explicitly set the VAD variables ourselves -	// see SL-15072 for more details -	unsigned int vad_hangover = 2001; -	unsigned int vad_noise_floor = 577; -	unsigned int vad_sensitivity = 44; -	setupVADParams(vad_hangover, vad_noise_floor, vad_sensitivity); -      LLSD timeoutEvent(LLSDMap("timeout", LLSD::Boolean(true)));      mIsInChannel = true; @@ -7628,11 +7628,13 @@ void LLVivoxProtocolParser::processResponse(std::string tag)  		}  		else if (!stricmp(actionCstr, "Aux.SetVadProperties.1"))  		{ -			std::cout << "@@@----" << std::endl; +			// temporary for debugging- will eventually remove entirely or replace with a  +			// toast message to alert the user that it was set +			std::cout << "@@@" << std::endl;  			std::cout << "    Response for Aux.SetVadProperties.1 was" << std::endl; -			std::cout << "      statusCode: " << statusCode << std::endl; -			std::cout << "    statusString: " << statusString << std::endl; -			std::cout << "----@@@" << std::endl; +			std::cout << "          statusCode: " << statusCode << std::endl; +			std::cout << "        statusString: " << statusString << std::endl; +			std::cout << "@@@" << std::endl;  		}  		/*  		 else if (!stricmp(actionCstr, "Account.ChannelGetList.1")) | 
