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

1
webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
View File

@ -77,6 +77,7 @@ AudioEncoderOpus::AudioEncoderOpus(const Config& config)
num_channels_(config.num_channels),
payload_type_(config.payload_type),
application_(config.application),
dtx_enabled_(config.dtx_enabled),
samples_per_10ms_frame_(rtc::CheckedDivExact(kSampleRateHz, 100) *
num_channels_),
packet_loss_rate_(0.0) {

2
webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h
View File

@ -55,6 +55,7 @@ class AudioEncoderOpus final : public AudioEncoder {
double packet_loss_rate() const { return packet_loss_rate_; }
ApplicationMode application() const { return application_; }
bool dtx_enabled() const { return dtx_enabled_; }
protected:
void EncodeInternal(uint32_t rtp_timestamp,
@ -69,6 +70,7 @@ class AudioEncoderOpus final : public AudioEncoder {
const int payload_type_;
const ApplicationMode application_;
int bitrate_bps_;
const bool dtx_enabled_;
const int samples_per_10ms_frame_;
std::vector<int16_t> input_buffer_;
OpusEncInst* inst_;