Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 72 // -audio_frame : an audio frame were output data and | 72 // -audio_frame : an audio frame were output data and |
| 73 // associated parameters are written to. | 73 // associated parameters are written to. |
| 74 // -muted : if true, the sample data in audio_frame is not | 74 // -muted : if true, the sample data in audio_frame is not |
| 75 // populated, and must be interpreted as all zero. | 75 // populated, and must be interpreted as all zero. |
| 76 // | 76 // |
| 77 // Return value : 0 if OK. | 77 // Return value : 0 if OK. |
| 78 // -1 if NetEq returned an error. | 78 // -1 if NetEq returned an error. |
| 79 // | 79 // |
| 80 int GetAudio(int desired_freq_hz, AudioFrame* audio_frame, bool* muted); | 80 int GetAudio(int desired_freq_hz, AudioFrame* audio_frame, bool* muted); |
| 81 | 81 |
| 82 // Replace the current set of deocders with the specified set. | |
|
the sun
2017/03/14 20:07:00
s/deocders/decoders/g
kwiberg-webrtc
2017/03/16 10:24:12
Done.
| |
| 83 void SetCodecs(const std::map<int, SdpAudioFormat>& codecs); | |
|
the sun
2017/03/14 20:07:00
nit: these aren't exactly "Codecs"...
kwiberg-webrtc
2017/03/16 10:24:12
What should these methods be called? SetDecoders?
| |
| 84 | |
| 82 // | 85 // |
| 83 // Adds a new codec to the NetEq codec database. | 86 // Adds a new codec to the NetEq codec database. |
| 84 // | 87 // |
| 85 // Input: | 88 // Input: |
| 86 // - acm_codec_id : ACM codec ID; -1 means external decoder. | 89 // - acm_codec_id : ACM codec ID; -1 means external decoder. |
| 87 // - payload_type : payload type. | 90 // - payload_type : payload type. |
| 88 // - sample_rate_hz : sample rate. | 91 // - sample_rate_hz : sample rate. |
| 89 // - audio_decoder : pointer to a decoder object. If it's null, then | 92 // - audio_decoder : pointer to a decoder object. If it's null, then |
| 90 // NetEq will internally create a decoder object | 93 // NetEq will internally create a decoder object |
| 91 // based on the value of |acm_codec_id| (which | 94 // based on the value of |acm_codec_id| (which |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 282 Clock* clock_; // TODO(henrik.lundin) Make const if possible. | 285 Clock* clock_; // TODO(henrik.lundin) Make const if possible. |
| 283 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_); | 286 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_); |
| 284 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_); | 287 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_); |
| 285 }; | 288 }; |
| 286 | 289 |
| 287 } // namespace acm2 | 290 } // namespace acm2 |
| 288 | 291 |
| 289 } // namespace webrtc | 292 } // namespace webrtc |
| 290 | 293 |
| 291 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ | 294 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ |
| OLD | NEW |