Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: webrtc/modules/audio_coding/acm2/acm_receive_test.cc

Issue 2337473002: Multi frequency DTMF support - receiver side (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 } else if (STR_CASE_CMP(plname, "CN") == 0 && plfreq == 16000) { 74 } else if (STR_CASE_CMP(plname, "CN") == 0 && plfreq == 16000) {
75 *pltype = 98; 75 *pltype = 98;
76 } else if (STR_CASE_CMP(plname, "CN") == 0 && plfreq == 32000) { 76 } else if (STR_CASE_CMP(plname, "CN") == 0 && plfreq == 32000) {
77 *pltype = 99; 77 *pltype = 99;
78 } else if (STR_CASE_CMP(plname, "ILBC") == 0) { 78 } else if (STR_CASE_CMP(plname, "ILBC") == 0) {
79 *pltype = 102; 79 *pltype = 102;
80 } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 16000) { 80 } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 16000) {
81 *pltype = 103; 81 *pltype = 103;
82 } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 32000) { 82 } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 32000) {
83 *pltype = 104; 83 *pltype = 104;
84 } else if (STR_CASE_CMP(plname, "telephone-event") == 0) { 84 } else if (STR_CASE_CMP(plname, "telephone-event") == 0 && plfreq == 8000) {
85 *pltype = 106; 85 *pltype = 106;
86 } else if (STR_CASE_CMP(plname, "telephone-event") == 0 && plfreq == 16000) {
87 *pltype = 114;
88 } else if (STR_CASE_CMP(plname, "telephone-event") == 0 && plfreq == 32000) {
89 *pltype = 115;
90 } else if (STR_CASE_CMP(plname, "telephone-event") == 0 && plfreq == 48000) {
91 *pltype = 116;
86 } else if (STR_CASE_CMP(plname, "red") == 0) { 92 } else if (STR_CASE_CMP(plname, "red") == 0) {
87 *pltype = 117; 93 *pltype = 117;
88 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 8000) { 94 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 8000) {
89 *pltype = 93; 95 *pltype = 93;
90 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 16000) { 96 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 16000) {
91 *pltype = 94; 97 *pltype = 94;
92 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 32000) { 98 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 32000) {
93 *pltype = 95; 99 *pltype = 95;
94 } else if (STR_CASE_CMP(plname, "G722") == 0) { 100 } else if (STR_CASE_CMP(plname, "G722") == 0) {
95 *pltype = 9; 101 *pltype = 9;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 if (clock_.TimeInMilliseconds() >= last_toggle_time_ms_ + toggle_period_ms_) { 234 if (clock_.TimeInMilliseconds() >= last_toggle_time_ms_ + toggle_period_ms_) {
229 output_freq_hz_ = (output_freq_hz_ == output_freq_hz_1_) 235 output_freq_hz_ = (output_freq_hz_ == output_freq_hz_1_)
230 ? output_freq_hz_2_ 236 ? output_freq_hz_2_
231 : output_freq_hz_1_; 237 : output_freq_hz_1_;
232 last_toggle_time_ms_ = clock_.TimeInMilliseconds(); 238 last_toggle_time_ms_ = clock_.TimeInMilliseconds();
233 } 239 }
234 } 240 }
235 241
236 } // namespace test 242 } // namespace test
237 } // namespace webrtc 243 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_codec_database.cc ('k') | webrtc/modules/audio_coding/acm2/acm_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698