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

Unified Diff: modules/audio_conference_mixer/include/audio_conference_mixer.h

Issue 3015553002: Remove voe::OutputMixer and AudioConferenceMixer. (Closed)
Patch Set: remove conference mixer from presubmit.py Created 3 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: modules/audio_conference_mixer/include/audio_conference_mixer.h
diff --git a/modules/audio_conference_mixer/include/audio_conference_mixer.h b/modules/audio_conference_mixer/include/audio_conference_mixer.h
deleted file mode 100644
index 0ccb6d9de579971551f6f44d3c82a86e2ecea329..0000000000000000000000000000000000000000
--- a/modules/audio_conference_mixer/include/audio_conference_mixer.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_
-#define MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_
-
-#include "modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"
-#include "modules/include/module.h"
-#include "modules/include/module_common_types.h"
-
-namespace webrtc {
-class AudioMixerOutputReceiver;
-class MixerParticipant;
-class Trace;
-
-class AudioConferenceMixer : public Module
-{
-public:
- enum {kMaximumAmountOfMixedParticipants = 3};
- enum Frequency
- {
- kNbInHz = 8000,
- kWbInHz = 16000,
- kSwbInHz = 32000,
- kFbInHz = 48000,
- kLowestPossible = -1,
- kDefaultFrequency = kWbInHz
- };
-
- // Factory method. Constructor disabled.
- static AudioConferenceMixer* Create(int id);
- virtual ~AudioConferenceMixer() {}
-
- // Module functions
- int64_t TimeUntilNextProcess() override = 0;
- void Process() override = 0;
-
- // Register/unregister a callback class for receiving the mixed audio.
- virtual int32_t RegisterMixedStreamCallback(
- AudioMixerOutputReceiver* receiver) = 0;
- virtual int32_t UnRegisterMixedStreamCallback() = 0;
-
- // Add/remove participants as candidates for mixing.
- virtual int32_t SetMixabilityStatus(MixerParticipant* participant,
- bool mixable) = 0;
- // Returns true if a participant is a candidate for mixing.
- virtual bool MixabilityStatus(
- const MixerParticipant& participant) const = 0;
-
- // Inform the mixer that the participant should always be mixed and not
- // count toward the number of mixed participants. Note that a participant
- // must have been added to the mixer (by calling SetMixabilityStatus())
- // before this function can be successfully called.
- virtual int32_t SetAnonymousMixabilityStatus(
- MixerParticipant* participant, bool mixable) = 0;
- // Returns true if the participant is mixed anonymously.
- virtual bool AnonymousMixabilityStatus(
- const MixerParticipant& participant) const = 0;
-
- // Set the minimum sampling frequency at which to mix. The mixing algorithm
- // may still choose to mix at a higher samling frequency to avoid
- // downsampling of audio contributing to the mixed audio.
- virtual int32_t SetMinimumMixingFrequency(Frequency freq) = 0;
-
-protected:
- AudioConferenceMixer() {}
-};
-} // namespace webrtc
-
-#endif // MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_
« no previous file with comments | « modules/audio_conference_mixer/OWNERS ('k') | modules/audio_conference_mixer/include/audio_conference_mixer_defines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698