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

Side by Side Diff: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

Issue 1589953002: Removing webrtc::AudioFrame::energy_. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: after review Created 4 years, 11 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
« no previous file with comments | « no previous file | webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 void GetAdditionalAudio(AudioFrameList* additionalFramesList) const; 109 void GetAdditionalAudio(AudioFrameList* additionalFramesList) const;
110 110
111 // Update the MixHistory of all MixerParticipants. mixedParticipantsList 111 // Update the MixHistory of all MixerParticipants. mixedParticipantsList
112 // should contain a map of MixerParticipants that have been mixed. 112 // should contain a map of MixerParticipants that have been mixed.
113 void UpdateMixedStatus( 113 void UpdateMixedStatus(
114 const std::map<int, MixerParticipant*>& mixedParticipantsList) const; 114 const std::map<int, MixerParticipant*>& mixedParticipantsList) const;
115 115
116 // Clears audioFrameList and reclaims all memory associated with it. 116 // Clears audioFrameList and reclaims all memory associated with it.
117 void ClearAudioFrameList(AudioFrameList* audioFrameList) const; 117 void ClearAudioFrameList(AudioFrameList* audioFrameList) const;
118 118
119 // Update the list of MixerParticipants who have a positive VAD. mixList
120 // should be a list of AudioFrames
121 void UpdateVADPositiveParticipants(AudioFrameList* mixList) const;
122
123 // This function returns true if it finds the MixerParticipant in the 119 // This function returns true if it finds the MixerParticipant in the
124 // specified list of MixerParticipants. 120 // specified list of MixerParticipants.
125 bool IsParticipantInList(const MixerParticipant& participant, 121 bool IsParticipantInList(const MixerParticipant& participant,
126 const MixerParticipantList& participantList) const; 122 const MixerParticipantList& participantList) const;
127 123
128 // Add/remove the MixerParticipant to the specified 124 // Add/remove the MixerParticipant to the specified
129 // MixerParticipant list. 125 // MixerParticipant list.
130 bool AddParticipantToList( 126 bool AddParticipantToList(
131 MixerParticipant* participant, 127 MixerParticipant* participant,
132 MixerParticipantList* participantList) const; 128 MixerParticipantList* participantList) const;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 // Counter keeping track of concurrent calls to process. 177 // Counter keeping track of concurrent calls to process.
182 // Note: should never be higher than 1 or lower than 0. 178 // Note: should never be higher than 1 or lower than 0.
183 int16_t _processCalls; 179 int16_t _processCalls;
184 180
185 // Used for inhibiting saturation in mixing. 181 // Used for inhibiting saturation in mixing.
186 rtc::scoped_ptr<AudioProcessing> _limiter; 182 rtc::scoped_ptr<AudioProcessing> _limiter;
187 }; 183 };
188 } // namespace webrtc 184 } // namespace webrtc
189 185
190 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM PL_H_ 186 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM PL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698