zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding flag to force Opus application and DTX while toggling.

Browse Source 
Currently, we only allow Opus DTX in combination with Opus kVoip mode. When one of them is toggled, the other might need to change as well. This CL is to introduce a flag to force a co-config.

BUG=
R=henrik.lundin@webrtc.org, tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/40159004

Cr-Commit-Position: refs/heads/master@{#8698}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8698 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
minyue@webrtc.org
2015-03-12 15:28:41 +00:00
parent 75b7f17c29
commit e16bfde512
10 changed files with 119 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
webrtc/modules/audio_coding/main/interface/audio_coding_module.h
View File

@ -876,18 +876,26 @@ class AudioCodingModule {
bool enforce_frame_size = false) = 0;
///////////////////////////////////////////////////////////////////////////
// int SetOpusApplication()
// Sets the intended application for the Opus encoder. Opus uses this to
// optimize the encoding for applications like VOIP and music.
// int SetOpusApplication(OpusApplicationMode application,
// bool disable_dtx_if_needed)
// Sets the intended application if current send codec is Opus. Opus uses this
// to optimize the encoding for applications like VOIP and music. Currently,
// two modes are supported: kVoip and kAudio. kAudio is only allowed when Opus
// DTX is switched off. If DTX is on, and |application| == kAudio, a failure
// will be triggered unless |disable_dtx_if_needed| == true, for which, the
// DTX will be forced off.
//
// Input:
// - application : intended application.
// - application : intended application.
// - disable_dtx_if_needed : whether to force Opus DTX to stop.
//
// Return value:
// -1 if failed or on codecs other than Opus.
// 0 if succeeded.
// -1 if current send codec is not Opus or error occurred in setting the
// Opus application mode.
// 0 if the Opus application mode is successfully set.
//
virtual int SetOpusApplication(OpusApplicationMode /*application*/) = 0;
virtual int SetOpusApplication(OpusApplicationMode application,
bool force_dtx) = 0;
///////////////////////////////////////////////////////////////////////////
// int SetOpusMaxPlaybackRate()
@ -901,31 +909,31 @@ class AudioCodingModule {
// Return value:
// -1 if current send codec is not Opus or
// error occurred in setting the maximum playback rate,
// 0 maximum bandwidth is set successfully.
// 0 if maximum bandwidth is set successfully.
//
virtual int SetOpusMaxPlaybackRate(int frequency_hz) = 0;
///////////////////////////////////////////////////////////////////////////
// int EnableOpusDtx()
// If current send codec is Opus, enables its internal DTX.
// Currently, this can be only called when Opus application mode is VOIP.
// Use SetOpusApplication() to switch to VOIP mode when necessary.
//
// EnableOpusDtx(bool force_voip)
// Enable the DTX, if current send codec is Opus. Currently, DTX can only be
// enabled when the application mode is kVoip. If |force_voip| == true,
// the application mode will be forced to kVoip. Otherwise, a failure will be
// triggered if current application mode is kAudio.
// Input:
// - force_application : whether to force application mode to kVoip.
// Return value:
// -1 if current send codec is not Opus or
// error occurred in enabling DTX.
// 0 Opus DTX is enabled successfully.
//
virtual int EnableOpusDtx() = 0;
// -1 if current send codec is not Opus or error occurred in enabling the
// Opus DTX.
// 0 if Opus DTX is enabled successfully..
virtual int EnableOpusDtx(bool force_application) = 0;
///////////////////////////////////////////////////////////////////////////
// int DisableOpusDtx()
// If current send codec is Opus, disables its internal DTX.
//
// Return value:
// -1 if current send codec is not Opus or
// error occurred in disabling DTX.
// 0 Opus DTX is disabled successfully.
// -1 if current send codec is not Opus or error occurred in disabling DTX.
// 0 if Opus DTX is disabled successfully.
//
virtual int DisableOpusDtx() = 0;