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

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

Issue 1976913002: Add muted_output parameter to ACM (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // 75 //
76 // Input: 76 // Input:
77 // -desired_freq_hz : specifies the sampling rate [Hz] of the output 77 // -desired_freq_hz : specifies the sampling rate [Hz] of the output
78 // audio. If set -1 indicates to resampling is 78 // audio. If set -1 indicates to resampling is
79 // is required and the audio returned at the 79 // is required and the audio returned at the
80 // sampling rate of the decoder. 80 // sampling rate of the decoder.
81 // 81 //
82 // Output: 82 // Output:
83 // -audio_frame : an audio frame were output data and 83 // -audio_frame : an audio frame were output data and
84 // associated parameters are written to. 84 // associated parameters are written to.
85 // -muted : if true, the sample data in audio_frame is not
86 // populated, and must be interpreted as all zero.
85 // 87 //
86 // Return value : 0 if OK. 88 // Return value : 0 if OK.
87 // -1 if NetEq returned an error. 89 // -1 if NetEq returned an error.
88 // 90 //
89 int GetAudio(int desired_freq_hz, AudioFrame* audio_frame); 91 int GetAudio(int desired_freq_hz, AudioFrame* audio_frame, bool* muted);
90 92
91 // 93 //
92 // Adds a new codec to the NetEq codec database. 94 // Adds a new codec to the NetEq codec database.
93 // 95 //
94 // Input: 96 // Input:
95 // - acm_codec_id : ACM codec ID; -1 means external decoder. 97 // - acm_codec_id : ACM codec ID; -1 means external decoder.
96 // - payload_type : payload type. 98 // - payload_type : payload type.
97 // - sample_rate_hz : sample rate. 99 // - sample_rate_hz : sample rate.
98 // - audio_decoder : pointer to a decoder object. If it's null, then 100 // - audio_decoder : pointer to a decoder object. If it's null, then
99 // NetEq will internally create a decoder object 101 // NetEq will internally create a decoder object
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 Clock* clock_; // TODO(henrik.lundin) Make const if possible. 272 Clock* clock_; // TODO(henrik.lundin) Make const if possible.
271 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_); 273 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_);
272 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_); 274 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_);
273 }; 275 };
274 276
275 } // namespace acm2 277 } // namespace acm2
276 278
277 } // namespace webrtc 279 } // namespace webrtc
278 280
279 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ 281 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698