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

Side by Side Diff: webrtc/modules/audio_mixer/include/audio_conference_mixer.h

Issue 2109333006: Removed TimeScheduler, Process() and TimeToNextProcess() from mixer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@remove_callback
Patch Set: Created 4 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
11 #ifndef WEBRTC_MODULES_AUDIO_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_
12 #define WEBRTC_MODULES_AUDIO_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_ 12 #define WEBRTC_MODULES_AUDIO_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_
13 13
14 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h" 14 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h"
15 #include "webrtc/modules/include/module.h" 15 #include "webrtc/modules/include/module.h"
16 #include "webrtc/modules/include/module_common_types.h" 16 #include "webrtc/modules/include/module_common_types.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 class AudioMixerOutputReceiver; 19 class AudioMixerOutputReceiver;
20 class MixerAudioSource; 20 class MixerAudioSource;
21 21
22 class NewAudioConferenceMixer : public Module { 22 class NewAudioConferenceMixer {
23 public: 23 public:
24 enum { kMaximumAmountOfMixedParticipants = 3 }; 24 enum { kMaximumAmountOfMixedParticipants = 3 };
25 enum Frequency { 25 enum Frequency {
26 kNbInHz = 8000, 26 kNbInHz = 8000,
27 kWbInHz = 16000, 27 kWbInHz = 16000,
28 kSwbInHz = 32000, 28 kSwbInHz = 32000,
29 kFbInHz = 48000, 29 kFbInHz = 48000,
30 kLowestPossible = -1, 30 kLowestPossible = -1,
31 kDefaultFrequency = kWbInHz 31 kDefaultFrequency = kWbInHz
32 }; 32 };
33 33
34 // Factory method. Constructor disabled. 34 // Factory method. Constructor disabled.
35 static NewAudioConferenceMixer* Create(int id); 35 static NewAudioConferenceMixer* Create(int id);
36 virtual ~NewAudioConferenceMixer() {} 36 virtual ~NewAudioConferenceMixer() {}
37 37
38 // Module functions
39 int64_t TimeUntilNextProcess() override = 0;
40 void Process() override = 0;
41
42 // Register/unregister a callback class for receiving the mixed audio. 38 // Register/unregister a callback class for receiving the mixed audio.
43 virtual int32_t RegisterMixedStreamCallback( 39 virtual int32_t RegisterMixedStreamCallback(
44 AudioMixerOutputReceiver* receiver) = 0; 40 AudioMixerOutputReceiver* receiver) = 0;
45 virtual int32_t UnRegisterMixedStreamCallback() = 0; 41 virtual int32_t UnRegisterMixedStreamCallback() = 0;
46 42
47 // Add/remove participants as candidates for mixing. 43 // Add/remove participants as candidates for mixing.
48 virtual int32_t SetMixabilityStatus(MixerAudioSource* participant, 44 virtual int32_t SetMixabilityStatus(MixerAudioSource* participant,
49 bool mixable) = 0; 45 bool mixable) = 0;
50 // Returns true if a participant is a candidate for mixing. 46 // Returns true if a participant is a candidate for mixing.
51 virtual bool MixabilityStatus(const MixerAudioSource& participant) const = 0; 47 virtual bool MixabilityStatus(const MixerAudioSource& participant) const = 0;
(...skipping 16 matching lines...) Expand all
68 // may still choose to mix at a higher samling frequency to avoid 64 // may still choose to mix at a higher samling frequency to avoid
69 // downsampling of audio contributing to the mixed audio. 65 // downsampling of audio contributing to the mixed audio.
70 virtual int32_t SetMinimumMixingFrequency(Frequency freq) = 0; 66 virtual int32_t SetMinimumMixingFrequency(Frequency freq) = 0;
71 67
72 protected: 68 protected:
73 NewAudioConferenceMixer() {} 69 NewAudioConferenceMixer() {}
74 }; 70 };
75 } // namespace webrtc 71 } // namespace webrtc
76 72
77 #endif // WEBRTC_MODULES_AUDIO_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_ 73 #endif // WEBRTC_MODULES_AUDIO_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698