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

Unified Diff: media/base/loopback_audio_converter.h

Issue 1483433003: Second layer of mixing for audio elements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: That fix Created 5 years 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
« no previous file with comments | « media/base/audio_renderer_mixer_unittest.cc ('k') | media/base/loopback_audio_converter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/loopback_audio_converter.h
diff --git a/media/audio/virtual_audio_input_stream.cc b/media/base/loopback_audio_converter.h
similarity index 19%
copy from media/audio/virtual_audio_input_stream.cc
copy to media/base/loopback_audio_converter.h
index e586ac88618872d9790c0e3e1e30bb3a6ed5e408..9bfd00f228ba2caf2f7d5702bbd0553401f1f373 100644
--- a/media/audio/virtual_audio_input_stream.cc
+++ b/media/base/loopback_audio_converter.h
@@ -2,14 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/audio/virtual_audio_input_stream.h"
+#ifndef MEDIA_BASE_LOOPBACK_AUDIO_CONVERTER_H_
+#define MEDIA_BASE_LOOPBACK_AUDIO_CONVERTER_H_
-#include <algorithm>
-#include <utility>
-
-#include "base/bind.h"
-#include "base/single_thread_task_runner.h"
-#include "media/audio/virtual_audio_output_stream.h"
+#include "base/macros.h"
+#include "media/base/audio_converter.h"
namespace media {
@@ -22,10 +19,10 @@ namespace media {
class LoopbackAudioConverter : public AudioConverter::InputCallback {
public:
LoopbackAudioConverter(const AudioParameters& input_params,
- const AudioParameters& output_params)
- : audio_converter_(input_params, output_params, false) {}
+ const AudioParameters& output_params,
+ bool disable_fifo);
- ~LoopbackAudioConverter() override {}
+ ~LoopbackAudioConverter() override;
void AddInput(AudioConverter::InputCallback* input) {
audio_converter_.AddInput(input);
@@ -35,153 +32,17 @@ class LoopbackAudioConverter : public AudioConverter::InputCallback {
audio_converter_.RemoveInput(input);
}
+ bool empty() { return audio_converter_.empty(); }
+
private:
double ProvideInput(AudioBus* audio_bus,
- base::TimeDelta buffer_delay) override {
- audio_converter_.ConvertWithDelay(buffer_delay, audio_bus);
- return 1.0;
- }
+ base::TimeDelta buffer_delay) override;
AudioConverter audio_converter_;
DISALLOW_COPY_AND_ASSIGN(LoopbackAudioConverter);
};
-VirtualAudioInputStream::VirtualAudioInputStream(
- const AudioParameters& params,
- const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner,
- const AfterCloseCallback& after_close_cb)
- : worker_task_runner_(worker_task_runner),
- after_close_cb_(after_close_cb),
- callback_(NULL),
- buffer_(new uint8[params.GetBytesPerBuffer()]),
- params_(params),
- mixer_(params_, params_, false),
- num_attached_output_streams_(0),
- fake_worker_(worker_task_runner_, params_),
- audio_bus_(AudioBus::Create(params)) {
- DCHECK(params_.IsValid());
- DCHECK(worker_task_runner_.get());
-
- // VAIS can be constructed on any thread, but will DCHECK that all
- // AudioInputStream methods are called from the same thread.
- thread_checker_.DetachFromThread();
-}
-
-VirtualAudioInputStream::~VirtualAudioInputStream() {
- DCHECK(!callback_);
-
- // Sanity-check: Contract for Add/RemoveOutputStream() requires that all
- // output streams be removed before VirtualAudioInputStream is destroyed.
- DCHECK_EQ(0, num_attached_output_streams_);
-
- for (AudioConvertersMap::iterator it = converters_.begin();
- it != converters_.end(); ++it) {
- delete it->second;
- }
-}
-
-bool VirtualAudioInputStream::Open() {
- DCHECK(thread_checker_.CalledOnValidThread());
- memset(buffer_.get(), 0, params_.GetBytesPerBuffer());
- return true;
-}
-
-void VirtualAudioInputStream::Start(AudioInputCallback* callback) {
- DCHECK(thread_checker_.CalledOnValidThread());
- callback_ = callback;
- fake_worker_.Start(base::Bind(
- &VirtualAudioInputStream::PumpAudio, base::Unretained(this)));
-}
-
-void VirtualAudioInputStream::Stop() {
- DCHECK(thread_checker_.CalledOnValidThread());
- fake_worker_.Stop();
- callback_ = NULL;
-}
-
-void VirtualAudioInputStream::AddOutputStream(
- VirtualAudioOutputStream* stream, const AudioParameters& output_params) {
- DCHECK(thread_checker_.CalledOnValidThread());
-
- base::AutoLock scoped_lock(converter_network_lock_);
-
- AudioConvertersMap::iterator converter = converters_.find(output_params);
- if (converter == converters_.end()) {
- std::pair<AudioConvertersMap::iterator, bool> result = converters_.insert(
- std::make_pair(output_params,
- new LoopbackAudioConverter(output_params, params_)));
- converter = result.first;
-
- // Add to main mixer if we just added a new AudioTransform.
- mixer_.AddInput(converter->second);
- }
- converter->second->AddInput(stream);
- ++num_attached_output_streams_;
-}
-
-void VirtualAudioInputStream::RemoveOutputStream(
- VirtualAudioOutputStream* stream, const AudioParameters& output_params) {
- DCHECK(thread_checker_.CalledOnValidThread());
-
- base::AutoLock scoped_lock(converter_network_lock_);
-
- DCHECK(converters_.find(output_params) != converters_.end());
- converters_[output_params]->RemoveInput(stream);
-
- --num_attached_output_streams_;
- DCHECK_LE(0, num_attached_output_streams_);
-}
-
-void VirtualAudioInputStream::PumpAudio() {
- DCHECK(worker_task_runner_->BelongsToCurrentThread());
-
- {
- base::AutoLock scoped_lock(converter_network_lock_);
- // Because the audio is being looped-back, the delay until it will be played
- // out is zero.
- mixer_.ConvertWithDelay(base::TimeDelta(), audio_bus_.get());
- }
- // Because the audio is being looped-back, the delay since since it was
- // recorded is zero.
- callback_->OnData(this, audio_bus_.get(), 0, 1.0);
-}
-
-void VirtualAudioInputStream::Close() {
- DCHECK(thread_checker_.CalledOnValidThread());
-
- Stop(); // Make sure callback_ is no longer being used.
-
- // If a non-null AfterCloseCallback was provided to the constructor, invoke it
- // here. The callback is moved to a stack-local first since |this| could be
- // destroyed during Run().
- if (!after_close_cb_.is_null()) {
- const AfterCloseCallback cb = after_close_cb_;
- after_close_cb_.Reset();
- cb.Run(this);
- }
-}
-
-double VirtualAudioInputStream::GetMaxVolume() {
- return 1.0;
-}
-
-void VirtualAudioInputStream::SetVolume(double volume) {}
-
-double VirtualAudioInputStream::GetVolume() {
- return 1.0;
-}
-
-bool VirtualAudioInputStream::SetAutomaticGainControl(bool enabled) {
- return false;
-}
-
-bool VirtualAudioInputStream::GetAutomaticGainControl() {
- return false;
-}
-
-bool VirtualAudioInputStream::IsMuted() {
- return false;
-}
-
} // namespace media
+
+#endif // MEDIA_BASE_LOOPBACK_AUDIO_CONVERTER_H_
« no previous file with comments | « media/base/audio_renderer_mixer_unittest.cc ('k') | media/base/loopback_audio_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698