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

CodecManager: Eliminate the stereo_send_ member

Browse Source 
It can be computed from other members, notably the current encoder's
number of channels.

BUG=webrtc:5028

Review URL: https://codereview.webrtc.org/1423803007

Cr-Commit-Position: refs/heads/master@{#10585}
This commit is contained in:
kwiberg
2015-11-10 09:47:36 -08:00
committed by Commit bot
parent a34bb2a78c
commit ed8275a44f
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/modules/audio_coding/main/acm2/codec_manager.cc
View File

@ -137,7 +137,6 @@ CodecManager::CodecManager()
cng_swb_pltype_(255), cng_swb_pltype_(255),
cng_fb_pltype_(255), cng_fb_pltype_(255),
red_nb_pltype_(255), red_nb_pltype_(255),
stereo_send_(false),
dtx_enabled_(false), dtx_enabled_(false),
vad_mode_(VADNormal), vad_mode_(VADNormal),
send_codec_inst_(kEmptyCodecInst), send_codec_inst_(kEmptyCodecInst),
@ -231,15 +230,12 @@ int CodecManager::RegisterEncoder(const CodecInst& send_codec) {
} }
// Set Stereo, and make sure VAD and DTX is turned off. // Set Stereo, and make sure VAD and DTX is turned off.
if (send_codec.channels == 2) { if (send_codec.channels != 1) {
stereo_send_ = true;
if (dtx_enabled_) { if (dtx_enabled_) {
WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, dummy_id, WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, dummy_id,
"VAD/DTX is turned off, not supported when sending stereo."); "VAD/DTX is turned off, not supported when sending stereo.");
} }
dtx_enabled_ = false; dtx_enabled_ = false;
} else {
stereo_send_ = false;
} }
// Check if the codec is already registered as send codec. // Check if the codec is already registered as send codec.
@ -321,7 +317,7 @@ void CodecManager::RegisterEncoder(AudioEncoder* external_speech_encoder) {
static const char kName[] = "external"; static const char kName[] = "external";
memcpy(send_codec_inst_.plname, kName, sizeof(kName)); memcpy(send_codec_inst_.plname, kName, sizeof(kName));
if (stereo_send_) if (send_codec_inst_.channels != 1)
dtx_enabled_ = false; dtx_enabled_ = false;
codec_fec_enabled_ = codec_fec_enabled_ =
codec_fec_enabled_ && codec_owner_.Encoder()->SetFec(codec_fec_enabled_); codec_fec_enabled_ && codec_owner_.Encoder()->SetFec(codec_fec_enabled_);
@ -374,7 +370,9 @@ int CodecManager::SetVAD(bool enable, ACMVADMode mode) {
// Check that the send codec is mono. We don't support VAD/DTX for stereo // Check that the send codec is mono. We don't support VAD/DTX for stereo
// sending. // sending.
if (enable && stereo_send_) { const auto* enc = codec_owner_.Encoder();
const bool stereo_send = enc ? (enc->NumChannels() != 1) : false;
if (enable && stereo_send) {
WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, 0, WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, 0,
"VAD/DTX not supported for stereo sending"); "VAD/DTX not supported for stereo sending");
dtx_enabled_ = false; dtx_enabled_ = false;
@ -391,7 +389,7 @@ int CodecManager::SetVAD(bool enable, ACMVADMode mode) {
if (dtx_enabled_ != enable || vad_mode_ != mode) { if (dtx_enabled_ != enable || vad_mode_ != mode) {
dtx_enabled_ = enable; dtx_enabled_ = enable;
vad_mode_ = mode; vad_mode_ = mode;
if (codec_owner_.Encoder()) { if (enc) {
int cng_pt = dtx_enabled_ ? CngPayloadType(send_codec_inst_.plfreq) : -1; int cng_pt = dtx_enabled_ ? CngPayloadType(send_codec_inst_.plfreq) : -1;
int red_pt = red_enabled_ ? RedPayloadType(send_codec_inst_.plfreq) : -1; int red_pt = red_enabled_ ? RedPayloadType(send_codec_inst_.plfreq) : -1;
codec_owner_.ChangeCngAndRed(cng_pt, vad_mode_, red_pt); codec_owner_.ChangeCngAndRed(cng_pt, vad_mode_, red_pt);

3
webrtc/modules/audio_coding/main/acm2/codec_manager.h
View File

@ -53,8 +53,6 @@ class CodecManager final {
// null. // null.
AudioDecoder* GetAudioDecoder(const CodecInst& codec); AudioDecoder* GetAudioDecoder(const CodecInst& codec);
bool stereo_send() const { return stereo_send_; }
bool red_enabled() const { return red_enabled_; } bool red_enabled() const { return red_enabled_; }
bool codec_fec_enabled() const { return codec_fec_enabled_; } bool codec_fec_enabled() const { return codec_fec_enabled_; }
@ -75,7 +73,6 @@ class CodecManager final {
uint8_t cng_swb_pltype_; uint8_t cng_swb_pltype_;
uint8_t cng_fb_pltype_; uint8_t cng_fb_pltype_;
uint8_t red_nb_pltype_; uint8_t red_nb_pltype_;
bool stereo_send_;
bool dtx_enabled_; bool dtx_enabled_;
ACMVADMode vad_mode_; ACMVADMode vad_mode_;
CodecInst send_codec_inst_; CodecInst send_codec_inst_;