diff options
| author | Arun Raghavan <git@arunraghavan.net> | 2015-11-07 10:26:39 +0530 |
|---|---|---|
| committer | Arun Raghavan <git@arunraghavan.net> | 2015-12-16 11:13:47 +0530 |
| commit | 9658f2e5660bdadccec3a0f68ca93402ddc8e51b (patch) | |
| tree | 147b5ee9e25b5d7298cc2b9affe42e7a9b815dd5 | |
| parent | 499dc9d4b8874026a521561864b7c63c0486844e (diff) | |
echo-cancel: Fix a bad condition in webrtc sample rate selection
The old logic would pick 8000 if the underlying sample rate was
16/32/48 kHz.
| -rw-r--r-- | src/modules/echo-cancel/webrtc.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-cancel/webrtc.cc index b8781f4e9..4c8332f82 100644 --- a/src/modules/echo-cancel/webrtc.cc +++ b/src/modules/echo-cancel/webrtc.cc @@ -116,16 +116,14 @@ static void pa_webrtc_ec_fixate_spec(pa_sample_spec *rec_ss, pa_channel_map *rec play_ss->format = PA_SAMPLE_S16NE; /* AudioProcessing expects one of the following rates */ - if (rec_ss->rate > 48000) + if (rec_ss->rate >= 48000) rec_ss->rate = 48000; - else if (rec_ss->rate > 32000 && rec_ss->rate < 48000) + else if (rec_ss->rate >= 32000) rec_ss->rate = 32000; - else if (rec_ss->rate > 16000 && rec_ss->rate < 32000) + else if (rec_ss->rate >= 16000) rec_ss->rate = 16000; - else if (rec_ss->rate != 8000) - rec_ss->rate = 8000; else - ; /* All good, rate is 8/16/32/48 kHz */ + rec_ss->rate = 8000; /* In int16 mode, AudioProcessing will give us the same spec we give it */ *out_ss = *rec_ss; |