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

Side by Side Diff: webrtc/voice_engine/output_mixer.h

Issue 1216133004: Removing AudioMixerStatusReceiver and ParticipantStatistics (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: removing LevelIndicator completely Created 5 years, 5 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) 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 14 matching lines...) Expand all
25 class AudioProcessing; 25 class AudioProcessing;
26 class CriticalSectionWrapper; 26 class CriticalSectionWrapper;
27 class FileWrapper; 27 class FileWrapper;
28 class VoEMediaProcess; 28 class VoEMediaProcess;
29 29
30 namespace voe { 30 namespace voe {
31 31
32 class Statistics; 32 class Statistics;
33 33
34 class OutputMixer : public AudioMixerOutputReceiver, 34 class OutputMixer : public AudioMixerOutputReceiver,
35 public AudioMixerStatusReceiver,
36 public FileCallback 35 public FileCallback
37 { 36 {
38 public: 37 public:
39 static int32_t Create(OutputMixer*& mixer, uint32_t instanceId); 38 static int32_t Create(OutputMixer*& mixer, uint32_t instanceId);
40 39
41 static void Destroy(OutputMixer*& mixer); 40 static void Destroy(OutputMixer*& mixer);
42 41
43 int32_t SetEngineInformation(Statistics& engineStatistics); 42 int32_t SetEngineInformation(Statistics& engineStatistics);
44 43
45 int32_t SetAudioProcessingModule( 44 int32_t SetAudioProcessingModule(
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 85
87 virtual ~OutputMixer(); 86 virtual ~OutputMixer();
88 87
89 // from AudioMixerOutputReceiver 88 // from AudioMixerOutputReceiver
90 virtual void NewMixedAudio( 89 virtual void NewMixedAudio(
91 int32_t id, 90 int32_t id,
92 const AudioFrame& generalAudioFrame, 91 const AudioFrame& generalAudioFrame,
93 const AudioFrame** uniqueAudioFrames, 92 const AudioFrame** uniqueAudioFrames,
94 uint32_t size); 93 uint32_t size);
95 94
96 // from AudioMixerStatusReceiver
97 virtual void MixedParticipants(
98 int32_t id,
99 const ParticipantStatistics* participantStatistics,
100 uint32_t size);
101
102 virtual void VADPositiveParticipants(
103 int32_t id,
104 const ParticipantStatistics* participantStatistics,
105 uint32_t size);
106
107 virtual void MixedAudioLevel(int32_t id, uint32_t level);
108
109 // For file recording 95 // For file recording
110 void PlayNotification(int32_t id, uint32_t durationMs); 96 void PlayNotification(int32_t id, uint32_t durationMs);
111 97
112 void RecordNotification(int32_t id, uint32_t durationMs); 98 void RecordNotification(int32_t id, uint32_t durationMs);
113 99
114 void PlayFileEnded(int32_t id); 100 void PlayFileEnded(int32_t id);
115 void RecordFileEnded(int32_t id); 101 void RecordFileEnded(int32_t id);
116 102
117 private: 103 private:
118 OutputMixer(uint32_t instanceId); 104 OutputMixer(uint32_t instanceId);
(...skipping 24 matching lines...) Expand all
143 int _mixingFrequencyHz; 129 int _mixingFrequencyHz;
144 FileRecorder* _outputFileRecorderPtr; 130 FileRecorder* _outputFileRecorderPtr;
145 bool _outputFileRecording; 131 bool _outputFileRecording;
146 }; 132 };
147 133
148 } // namespace voe 134 } // namespace voe
149 135
150 } // namespace werbtc 136 } // namespace werbtc
151 137
152 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_ 138 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698