b4977de306
Made path from NetEq to AudioTransport ready for many-channel audio. If there is one stream, we can handle anything that fits in an AudioFrame. For many streams, the current limit is 6. Some multi-channel combinations are not supported: e.g. if we get stereo audio and attempt to play out 6 channels. Changes: * AudioFrameOperations - replaced the MonoTo* and *ToMono methods by UpmixChannels & DownmixChannels. * AudioMixer: removed DCHECKs for <= 2 channels and tweaked the mixing algorithm to handle many channels. Bug: webrtc:8649 Change-Id: Ib83e16d463694e35658caa09c27849e853d508fb Reviewed-on: https://webrtc-review.googlesource.com/c/106040 Reviewed-by: Oskar Sundbom <ossu@webrtc.org> Commit-Queue: Alex Loiko <aleloi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26446}
109 lines
3.7 KiB
C++
109 lines
3.7 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/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/critical_section.h"
|
|
#include "rtc_base/race_checker.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
|
|
namespace webrtc {
|
|
|
|
typedef std::vector<AudioFrame*> AudioFrameList;
|
|
|
|
class AudioMixerImpl : public AudioMixer {
|
|
public:
|
|
struct SourceStatus {
|
|
SourceStatus(Source* audio_source, bool is_mixed, float gain)
|
|
: audio_source(audio_source), is_mixed(is_mixed), gain(gain) {}
|
|
Source* audio_source = nullptr;
|
|
bool is_mixed = false;
|
|
float gain = 0.0f;
|
|
|
|
// A frame that will be passed to audio_source->GetAudioFrameWithInfo.
|
|
AudioFrame audio_frame;
|
|
};
|
|
|
|
using SourceStatusList = std::vector<std::unique_ptr<SourceStatus>>;
|
|
|
|
// AudioProcessing only accepts 10 ms frames.
|
|
static const int kFrameDurationInMs = 10;
|
|
static const int kMaximumAmountOfMixedAudioSources = 3;
|
|
|
|
static rtc::scoped_refptr<AudioMixerImpl> Create();
|
|
|
|
static rtc::scoped_refptr<AudioMixerImpl> Create(
|
|
std::unique_ptr<OutputRateCalculator> output_rate_calculator,
|
|
bool use_limiter);
|
|
|
|
~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(crit_);
|
|
|
|
// 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);
|
|
|
|
private:
|
|
// Set mixing frequency through OutputFrequencyCalculator.
|
|
void CalculateOutputFrequency();
|
|
// Get mixing frequency.
|
|
int OutputFrequency() const;
|
|
|
|
// Compute what audio sources to mix from audio_source_list_. Ramp
|
|
// in and out. Update mixed status. Mixes up to
|
|
// kMaximumAmountOfMixedAudioSources audio sources.
|
|
AudioFrameList GetAudioFromSources() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
|
|
// 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.
|
|
rtc::CriticalSection crit_;
|
|
rtc::RaceChecker race_checker_;
|
|
|
|
std::unique_ptr<OutputRateCalculator> output_rate_calculator_;
|
|
// The current sample frequency and sample size when mixing.
|
|
int output_frequency_ RTC_GUARDED_BY(race_checker_);
|
|
size_t sample_size_ RTC_GUARDED_BY(race_checker_);
|
|
|
|
// List of all audio sources. Note all lists are disjunct
|
|
SourceStatusList audio_source_list_ RTC_GUARDED_BY(crit_); // May be mixed.
|
|
|
|
// Component that handles actual adding of audio frames.
|
|
FrameCombiner frame_combiner_ RTC_GUARDED_BY(race_checker_);
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixerImpl);
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
|