From 58e08cbea85295ca7aca293c31117994b558e515 Mon Sep 17 00:00:00 2001 From: minyue Date: Wed, 24 Feb 2016 03:49:19 -0800 Subject: [PATCH] Reset indexer upon initialization in AudioLoop. The array is reset in Init() but not the indexer. This makes the start point undefined after Init() for re-initializing an AudioLoop. This can be fixed. BUG= Review URL: https://codereview.webrtc.org/1727353002 Cr-Commit-Position: refs/heads/master@{#11739} --- webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc | 8 ++++---- webrtc/modules/audio_coding/neteq/tools/audio_loop.cc | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc b/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc index cdfa62b752..c33905a388 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc @@ -200,17 +200,17 @@ void OpusTest::TestDtxEffect(bool dtx, int block_length_ms) { const int max_dtx_frames = 400 / block_length_ms + 1; // We run |kRunTimeMs| milliseconds of pure silence. - const int kRunTimeMs = 2000; + const int kRunTimeMs = 4500; // We check that, after a |kCheckTimeMs| milliseconds (given that the CNG in // Opus needs time to adapt), the absolute values of DTX decoded signal are // bounded by |kOutputValueBound|. - const int kCheckTimeMs = 1500; + const int kCheckTimeMs = 4000; #if defined(OPUS_FIXED_POINT) - const uint16_t kOutputValueBound = 30; + const uint16_t kOutputValueBound = 20; #else - const uint16_t kOutputValueBound = 8; + const uint16_t kOutputValueBound = 2; #endif int time = 0; diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc b/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc index eed95753f0..56765aaefa 100644 --- a/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc +++ b/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc @@ -40,6 +40,7 @@ bool AudioLoop::Init(const std::string file_name, loop_length_samples_ = samples_read; block_length_samples_ = block_length_samples; + next_index_ = 0; return true; }