mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 23:57:59 +01:00
dbf13e32ec
This allows mixing different number of streams depending on the client's capabilities. This CL adds `WebRTC.Audio.AudioMixer.NumIncomingActiveStreams2`, which is defined in [1], since the histogram is not logged anymore as enum. [1] https://chromium-review.googlesource.com/c/chromium/src/+/2883627 Bug: webrtc:12746 Change-Id: I0d9b3888f0f95269806539e33b56619b757a5c68 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/218160 Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Minyue Li <minyue@webrtc.org> Reviewed-by: Johannes Kron <kron@webrtc.org> Commit-Queue: Doudou Kisabaka <doudouk@google.com> Cr-Commit-Position: refs/heads/master@{#34024}
100 lines
3.2 KiB
C++
100 lines
3.2 KiB
C++
/*
|
|
* Copyright (c) 2012 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_MIXER_AUDIO_MIXER_IMPL_H_
|
|
#define MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/array_view.h"
|
|
#include "api/audio/audio_frame.h"
|
|
#include "api/audio/audio_mixer.h"
|
|
#include "api/scoped_refptr.h"
|
|
#include "modules/audio_mixer/frame_combiner.h"
|
|
#include "modules/audio_mixer/output_rate_calculator.h"
|
|
#include "rtc_base/constructor_magic.h"
|
|
#include "rtc_base/race_checker.h"
|
|
#include "rtc_base/synchronization/mutex.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioMixerImpl : public AudioMixer {
|
|
public:
|
|
struct SourceStatus;
|
|
|
|
// AudioProcessing only accepts 10 ms frames.
|
|
static const int kFrameDurationInMs = 10;
|
|
|
|
static const int kDefaultNumberOfMixedAudioSources = 3;
|
|
|
|
static rtc::scoped_refptr<AudioMixerImpl> Create(
|
|
int max_sources_to_mix = kDefaultNumberOfMixedAudioSources);
|
|
|
|
static rtc::scoped_refptr<AudioMixerImpl> Create(
|
|
std::unique_ptr<OutputRateCalculator> output_rate_calculator,
|
|
bool use_limiter,
|
|
int max_sources_to_mix = kDefaultNumberOfMixedAudioSources);
|
|
|
|
~AudioMixerImpl() override;
|
|
|
|
// AudioMixer functions
|
|
bool AddSource(Source* audio_source) override;
|
|
void RemoveSource(Source* audio_source) override;
|
|
|
|
void Mix(size_t number_of_channels,
|
|
AudioFrame* audio_frame_for_mixing) override
|
|
RTC_LOCKS_EXCLUDED(mutex_);
|
|
|
|
// Returns true if the source was mixed last round. Returns
|
|
// false and logs an error if the source was never added to the
|
|
// mixer.
|
|
bool GetAudioSourceMixabilityStatusForTest(Source* audio_source) const;
|
|
|
|
protected:
|
|
AudioMixerImpl(std::unique_ptr<OutputRateCalculator> output_rate_calculator,
|
|
bool use_limiter,
|
|
int max_sources_to_mix);
|
|
|
|
private:
|
|
struct HelperContainers;
|
|
|
|
// Compute what audio sources to mix from audio_source_list_. Ramp
|
|
// in and out. Update mixed status. Mixes up to
|
|
// kMaximumAmountOfMixedAudioSources audio sources.
|
|
rtc::ArrayView<AudioFrame* const> GetAudioFromSources(int output_frequency)
|
|
RTC_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
|
|
|
|
// The critical section lock guards audio source insertion and
|
|
// removal, which can be done from any thread. The race checker
|
|
// checks that mixing is done sequentially.
|
|
mutable Mutex mutex_;
|
|
|
|
const int max_sources_to_mix_;
|
|
|
|
std::unique_ptr<OutputRateCalculator> output_rate_calculator_;
|
|
|
|
// List of all audio sources.
|
|
std::vector<std::unique_ptr<SourceStatus>> audio_source_list_
|
|
RTC_GUARDED_BY(mutex_);
|
|
const std::unique_ptr<HelperContainers> helper_containers_
|
|
RTC_GUARDED_BY(mutex_);
|
|
|
|
// Component that handles actual adding of audio frames.
|
|
FrameCombiner frame_combiner_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixerImpl);
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
|