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

Side by Side Diff: webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 22 matching lines...) Expand all
33 // This function specifies the sampling frequency needed for the AudioFrame 33 // This function specifies the sampling frequency needed for the AudioFrame
34 // for future GetAudioFrame(..) calls. 34 // for future GetAudioFrame(..) calls.
35 virtual int32_t NeededFrequency(const int32_t id) = 0; 35 virtual int32_t NeededFrequency(const int32_t id) = 0;
36 36
37 MixHistory* _mixHistory; 37 MixHistory* _mixHistory;
38 protected: 38 protected:
39 MixerParticipant(); 39 MixerParticipant();
40 virtual ~MixerParticipant(); 40 virtual ~MixerParticipant();
41 }; 41 };
42 42
43 // Container struct for participant statistics.
44 struct ParticipantStatistics
45 {
46 int32_t participant;
47 int32_t level;
48 };
49
50 class AudioMixerStatusReceiver
51 {
52 public:
53 // Callback function that provides an array of ParticipantStatistics for the
54 // participants that were mixed last mix iteration.
55 virtual void MixedParticipants(
56 const int32_t id,
57 const ParticipantStatistics* participantStatistics,
58 const uint32_t size) = 0;
59 // Callback function that provides an array of the ParticipantStatistics for
60 // the participants that had a positiv VAD last mix iteration.
61 virtual void VADPositiveParticipants(
62 const int32_t id,
63 const ParticipantStatistics* participantStatistics,
64 const uint32_t size) = 0;
65 // Callback function that provides the audio level of the mixed audio frame
66 // from the last mix iteration.
67 virtual void MixedAudioLevel(
68 const int32_t id,
69 const uint32_t level) = 0;
70 protected:
71 AudioMixerStatusReceiver() {}
72 virtual ~AudioMixerStatusReceiver() {}
73 };
74
75 class AudioMixerOutputReceiver 43 class AudioMixerOutputReceiver
76 { 44 {
77 public: 45 public:
78 // This callback function provides the mixed audio for this mix iteration. 46 // This callback function provides the mixed audio for this mix iteration.
79 // Note that uniqueAudioFrames is an array of AudioFrame pointers with the 47 // Note that uniqueAudioFrames is an array of AudioFrame pointers with the
80 // size according to the size parameter. 48 // size according to the size parameter.
81 virtual void NewMixedAudio(const int32_t id, 49 virtual void NewMixedAudio(const int32_t id,
82 const AudioFrame& generalAudioFrame, 50 const AudioFrame& generalAudioFrame,
83 const AudioFrame** uniqueAudioFrames, 51 const AudioFrame** uniqueAudioFrames,
84 const uint32_t size) = 0; 52 const uint32_t size) = 0;
85 protected: 53 protected:
86 AudioMixerOutputReceiver() {} 54 AudioMixerOutputReceiver() {}
87 virtual ~AudioMixerOutputReceiver() {} 55 virtual ~AudioMixerOutputReceiver() {}
88 }; 56 };
89 } // namespace webrtc 57 } // namespace webrtc
90 58
91 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER _DEFINES_H_ 59 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER _DEFINES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698