diff options
Diffstat (limited to 'modules/audio_coding')
-rw-r--r-- | modules/audio_coding/codecs/isac/main/source/isac.c | 4 | ||||
-rw-r--r-- | modules/audio_coding/main/acm2/acm_generic_codec.cc | 2 | ||||
-rw-r--r-- | modules/audio_coding/main/acm2/acm_opus.cc | 2 | ||||
-rw-r--r-- | modules/audio_coding/main/acm2/acm_speex.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/modules/audio_coding/codecs/isac/main/source/isac.c b/modules/audio_coding/codecs/isac/main/source/isac.c index fa54a8d8..d47eb80b 100644 --- a/modules/audio_coding/codecs/isac/main/source/isac.c +++ b/modules/audio_coding/codecs/isac/main/source/isac.c @@ -2243,8 +2243,6 @@ int16_t WebRtcIsac_SetEncSampRate(ISACStruct* ISAC_main_inst, } else { ISACUBStruct* instUB = &(instISAC->instUB); ISACLBStruct* instLB = &(instISAC->instLB); - double bottleneckLB; - double bottleneckUB; int32_t bottleneck = instISAC->bottleneck; int16_t codingMode = instISAC->codingMode; int16_t frameSizeMs = instLB->ISACencLB_obj.new_framelength / @@ -2263,6 +2261,8 @@ int16_t WebRtcIsac_SetEncSampRate(ISACStruct* ISAC_main_inst, instISAC->maxRateBytesPer30Ms = STREAM_SIZE_MAX_30; } else if ((encoder_operational_rate == kIsacSuperWideband) && (instISAC->encoderSamplingRateKHz == kIsacWideband)) { + double bottleneckLB = 0; + double bottleneckUB = 0; if (codingMode == 1) { WebRtcIsac_RateAllocation(bottleneck, &bottleneckLB, &bottleneckUB, &(instISAC->bandwidthKHz)); diff --git a/modules/audio_coding/main/acm2/acm_generic_codec.cc b/modules/audio_coding/main/acm2/acm_generic_codec.cc index d16d1d38..db776d2e 100644 --- a/modules/audio_coding/main/acm2/acm_generic_codec.cc +++ b/modules/audio_coding/main/acm2/acm_generic_codec.cc @@ -838,7 +838,7 @@ int16_t ACMGenericCodec::ProcessFrameVADDTX(uint8_t* bitstream, // Calculate number of samples in 10 ms blocks, and number ms in one frame. int16_t samples_in_10ms = static_cast<int16_t>(freq_hz / 100); int32_t frame_len_ms = static_cast<int32_t>(frame_len_smpl_) * 1000 / freq_hz; - int16_t status; + int16_t status = -1; // Vector for storing maximum 30 ms of mono audio at 48 kHz. int16_t audio[1440]; diff --git a/modules/audio_coding/main/acm2/acm_opus.cc b/modules/audio_coding/main/acm2/acm_opus.cc index 544c932f..638c72a9 100644 --- a/modules/audio_coding/main/acm2/acm_opus.cc +++ b/modules/audio_coding/main/acm2/acm_opus.cc @@ -80,7 +80,7 @@ ACMOpus::ACMOpus(int16_t codec_id) if (codec_id_ != ACMCodecDB::kOpus) { WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, unique_id_, "Wrong codec id for Opus."); - sample_freq_ = -1; + sample_freq_ = 0xFFFF; bitrate_ = -1; } return; diff --git a/modules/audio_coding/main/acm2/acm_speex.cc b/modules/audio_coding/main/acm2/acm_speex.cc index 84a0592a..c4d7628d 100644 --- a/modules/audio_coding/main/acm2/acm_speex.cc +++ b/modules/audio_coding/main/acm2/acm_speex.cc @@ -30,7 +30,7 @@ ACMSPEEX::ACMSPEEX(int16_t /* codec_id */) vbr_enabled_(false), encoding_rate_(-1), sampling_frequency_(-1), - samples_in_20ms_audio_(-1) { + samples_in_20ms_audio_(0xFFFF) { return; } |