| OLD | NEW |
| 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 29 matching lines...) Expand all Loading... |
| 40 // neteq_universal_new.rtp. Returns true if the codec should be registered, | 40 // neteq_universal_new.rtp. Returns true if the codec should be registered, |
| 41 // otherwise false. The payload types are set as follows (all are mono codecs): | 41 // otherwise false. The payload types are set as follows (all are mono codecs): |
| 42 // PCMu = 0; | 42 // PCMu = 0; |
| 43 // PCMa = 8; | 43 // PCMa = 8; |
| 44 // Comfort noise 8 kHz = 13 | 44 // Comfort noise 8 kHz = 13 |
| 45 // Comfort noise 16 kHz = 98 | 45 // Comfort noise 16 kHz = 98 |
| 46 // Comfort noise 32 kHz = 99 | 46 // Comfort noise 32 kHz = 99 |
| 47 // iLBC = 102 | 47 // iLBC = 102 |
| 48 // iSAC wideband = 103 | 48 // iSAC wideband = 103 |
| 49 // iSAC super-wideband = 104 | 49 // iSAC super-wideband = 104 |
| 50 // iSAC fullband = 124 | |
| 51 // AVT/DTMF = 106 | 50 // AVT/DTMF = 106 |
| 52 // RED = 117 | 51 // RED = 117 |
| 53 // PCM16b 8 kHz = 93 | 52 // PCM16b 8 kHz = 93 |
| 54 // PCM16b 16 kHz = 94 | 53 // PCM16b 16 kHz = 94 |
| 55 // PCM16b 32 kHz = 95 | 54 // PCM16b 32 kHz = 95 |
| 56 // G.722 = 94 | 55 // G.722 = 94 |
| 57 bool RemapPltypeAndUseThisCodec(const char* plname, | 56 bool RemapPltypeAndUseThisCodec(const char* plname, |
| 58 int plfreq, | 57 int plfreq, |
| 59 int channels, | 58 int channels, |
| 60 int* pltype) { | 59 int* pltype) { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 71 } else if (STR_CASE_CMP(plname, "CN") == 0 && plfreq == 16000) { | 70 } else if (STR_CASE_CMP(plname, "CN") == 0 && plfreq == 16000) { |
| 72 *pltype = 98; | 71 *pltype = 98; |
| 73 } else if (STR_CASE_CMP(plname, "CN") == 0 && plfreq == 32000) { | 72 } else if (STR_CASE_CMP(plname, "CN") == 0 && plfreq == 32000) { |
| 74 *pltype = 99; | 73 *pltype = 99; |
| 75 } else if (STR_CASE_CMP(plname, "ILBC") == 0) { | 74 } else if (STR_CASE_CMP(plname, "ILBC") == 0) { |
| 76 *pltype = 102; | 75 *pltype = 102; |
| 77 } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 16000) { | 76 } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 16000) { |
| 78 *pltype = 103; | 77 *pltype = 103; |
| 79 } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 32000) { | 78 } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 32000) { |
| 80 *pltype = 104; | 79 *pltype = 104; |
| 81 } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 48000) { | |
| 82 *pltype = 124; | |
| 83 } else if (STR_CASE_CMP(plname, "telephone-event") == 0) { | 80 } else if (STR_CASE_CMP(plname, "telephone-event") == 0) { |
| 84 *pltype = 106; | 81 *pltype = 106; |
| 85 } else if (STR_CASE_CMP(plname, "red") == 0) { | 82 } else if (STR_CASE_CMP(plname, "red") == 0) { |
| 86 *pltype = 117; | 83 *pltype = 117; |
| 87 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 8000) { | 84 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 8000) { |
| 88 *pltype = 93; | 85 *pltype = 93; |
| 89 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 16000) { | 86 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 16000) { |
| 90 *pltype = 94; | 87 *pltype = 94; |
| 91 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 32000) { | 88 } else if (STR_CASE_CMP(plname, "L16") == 0 && plfreq == 32000) { |
| 92 *pltype = 95; | 89 *pltype = 95; |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 if (clock_.TimeInMilliseconds() >= last_toggle_time_ms_ + toggle_period_ms_) { | 212 if (clock_.TimeInMilliseconds() >= last_toggle_time_ms_ + toggle_period_ms_) { |
| 216 output_freq_hz_ = (output_freq_hz_ == output_freq_hz_1_) | 213 output_freq_hz_ = (output_freq_hz_ == output_freq_hz_1_) |
| 217 ? output_freq_hz_2_ | 214 ? output_freq_hz_2_ |
| 218 : output_freq_hz_1_; | 215 : output_freq_hz_1_; |
| 219 last_toggle_time_ms_ = clock_.TimeInMilliseconds(); | 216 last_toggle_time_ms_ = clock_.TimeInMilliseconds(); |
| 220 } | 217 } |
| 221 } | 218 } |
| 222 | 219 |
| 223 } // namespace test | 220 } // namespace test |
| 224 } // namespace webrtc | 221 } // namespace webrtc |
| OLD | NEW |