Remove unnecessary warnings.
BUG= TEST=try job R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/8719005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5565 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -124,7 +124,7 @@ AcmReceiver::AcmReceiver()
|
|||||||
decode_lock_(RWLockWrapper::CreateRWLock()),
|
decode_lock_(RWLockWrapper::CreateRWLock()),
|
||||||
neteq_crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
|
neteq_crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
|
||||||
vad_enabled_(true),
|
vad_enabled_(true),
|
||||||
previous_audio_activity_(AudioFrame::kVadUnknown),
|
previous_audio_activity_(AudioFrame::kVadPassive),
|
||||||
current_sample_rate_hz_(kNeteqInitSampleRateHz),
|
current_sample_rate_hz_(kNeteqInitSampleRateHz),
|
||||||
nack_(),
|
nack_(),
|
||||||
nack_enabled_(false),
|
nack_enabled_(false),
|
||||||
@@ -557,8 +557,6 @@ int AcmReceiver::RemoveAllCodecs() {
|
|||||||
int AcmReceiver::RemoveCodec(uint8_t payload_type) {
|
int AcmReceiver::RemoveCodec(uint8_t payload_type) {
|
||||||
int codec_index = PayloadType2CodecIndex(payload_type);
|
int codec_index = PayloadType2CodecIndex(payload_type);
|
||||||
if (codec_index < 0) { // Such a payload-type is not registered.
|
if (codec_index < 0) { // Such a payload-type is not registered.
|
||||||
LOG(LS_WARNING) << "payload_type " << payload_type << " is not registered,"
|
|
||||||
" no action is taken.";
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (neteq_->RemovePayloadType(payload_type) != NetEq::kOK) {
|
if (neteq_->RemovePayloadType(payload_type) != NetEq::kOK) {
|
||||||
@@ -612,7 +610,6 @@ int AcmReceiver::RedPayloadType() const {
|
|||||||
int AcmReceiver::LastAudioCodec(CodecInst* codec) const {
|
int AcmReceiver::LastAudioCodec(CodecInst* codec) const {
|
||||||
CriticalSectionScoped lock(neteq_crit_sect_);
|
CriticalSectionScoped lock(neteq_crit_sect_);
|
||||||
if (last_audio_decoder_ < 0) {
|
if (last_audio_decoder_ < 0) {
|
||||||
LOG_F(LS_WARNING) << "No audio payload is received, yet.";
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
assert(decoders_[last_audio_decoder_].registered);
|
assert(decoders_[last_audio_decoder_].registered);
|
||||||
|
|||||||
Reference in New Issue
Block a user