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

Side by Side Diff: webrtc/modules/audio_coding/acm2/acm_receiver.h

Issue 2772043002: Revert of WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType (Closed)
Patch Set: Created 3 years, 9 months 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) 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
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 decoders with the specified set.
83 void SetCodecs(const std::map<int, SdpAudioFormat>& codecs);
84
85 // 82 //
86 // Adds a new codec to the NetEq codec database. 83 // Adds a new codec to the NetEq codec database.
87 // 84 //
88 // Input: 85 // Input:
89 // - acm_codec_id : ACM codec ID; -1 means external decoder. 86 // - acm_codec_id : ACM codec ID; -1 means external decoder.
90 // - payload_type : payload type. 87 // - payload_type : payload type.
91 // - sample_rate_hz : sample rate. 88 // - sample_rate_hz : sample rate.
92 // - audio_decoder : pointer to a decoder object. If it's null, then 89 // - audio_decoder : pointer to a decoder object. If it's null, then
93 // NetEq will internally create a decoder object 90 // NetEq will internally create a decoder object
94 // based on the value of |acm_codec_id| (which 91 // based on the value of |acm_codec_id| (which
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 Clock* clock_; // TODO(henrik.lundin) Make const if possible. 282 Clock* clock_; // TODO(henrik.lundin) Make const if possible.
286 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_); 283 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_);
287 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_); 284 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_);
288 }; 285 };
289 286
290 } // namespace acm2 287 } // namespace acm2
291 288
292 } // namespace webrtc 289 } // namespace webrtc
293 290
294 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ 291 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine_unittest.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