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

Unified Diff: chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.cc

Issue 2701613006: [Chromecast] Process streams with different post-processing. (Closed)
Patch Set: Fix unittests Created 3 years, 10 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: chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.cc
diff --git a/chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.cc b/chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.cc
index 656130bed534469bea6c3c3510c2195860853d9d..db8c3d5ef0adb3ba35c9055fcdfbae4b046852c8 100644
--- a/chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.cc
+++ b/chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.cc
@@ -65,11 +65,14 @@ StreamMixerAlsaInputImpl::StreamMixerAlsaInputImpl(
StreamMixerAlsaInput::Delegate* delegate,
int input_samples_per_second,
bool primary,
+ const std::string& device_id,
StreamMixerAlsa* mixer)
: delegate_(delegate),
input_samples_per_second_(input_samples_per_second),
primary_(primary),
+ device_id_(device_id),
mixer_(mixer),
+ filter_group_(nullptr),
mixer_task_runner_(mixer_->task_runner()),
caller_task_runner_(base::ThreadTaskRunnerHandle::Get()),
resample_ratio_(1.0),
@@ -85,14 +88,14 @@ StreamMixerAlsaInputImpl::StreamMixerAlsaInputImpl(
zeroed_frames_(0),
is_underflowing_(false),
weak_factory_(this) {
- LOG(INFO) << "Create " << this;
+ LOG(INFO) << "Create " << device_id_ << " (" << this << ")";
DCHECK(delegate_);
DCHECK(mixer_);
weak_this_ = weak_factory_.GetWeakPtr();
}
StreamMixerAlsaInputImpl::~StreamMixerAlsaInputImpl() {
- LOG(INFO) << "Destroy " << this;
+ LOG(INFO) << "Destroy " << device_id_ << " (" << this << ")";
DCHECK(mixer_task_runner_->BelongsToCurrentThread());
}
@@ -104,6 +107,10 @@ bool StreamMixerAlsaInputImpl::primary() const {
return primary_;
}
+std::string StreamMixerAlsaInputImpl::device_id() const {
+ return device_id_;
+}
+
bool StreamMixerAlsaInputImpl::IsDeleting() const {
DCHECK(mixer_task_runner_->BelongsToCurrentThread());
return (state_ == kStateFinalFade || state_ == kStateDeleted);
@@ -127,6 +134,14 @@ void StreamMixerAlsaInputImpl::Initialize(
fade_frames_remaining_ = NormalFadeFrames();
}
+void StreamMixerAlsaInputImpl::set_filter_group(FilterGroup* filter_group) {
+ filter_group_ = filter_group;
+}
+
+FilterGroup* StreamMixerAlsaInputImpl::filter_group() {
+ return filter_group_;
+}
+
void StreamMixerAlsaInputImpl::PreventDelegateCalls() {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
weak_factory_.InvalidateWeakPtrs();
@@ -426,7 +441,6 @@ int StreamMixerAlsaInputImpl::NormalFadeFrames() {
void StreamMixerAlsaInputImpl::FadeIn(::media::AudioBus* dest, int frames) {
DCHECK(mixer_task_runner_->BelongsToCurrentThread());
- LOG(INFO) << "Fading in, " << fade_frames_remaining_ << " frames remaining";
float fade_in_frames = mixer_->output_samples_per_second() * kFadeMs /
base::Time::kMillisecondsPerSecond;
for (int f = 0; f < frames && fade_frames_remaining_; ++f) {
@@ -439,7 +453,6 @@ void StreamMixerAlsaInputImpl::FadeIn(::media::AudioBus* dest, int frames) {
void StreamMixerAlsaInputImpl::FadeOut(::media::AudioBus* dest, int frames) {
DCHECK(mixer_task_runner_->BelongsToCurrentThread());
- LOG(INFO) << "Fading out, " << fade_frames_remaining_ << " frames remaining";
int f = 0;
for (; f < frames && fade_frames_remaining_; ++f) {
float fade_multiplier =
@@ -515,7 +528,7 @@ void StreamMixerAlsaInputImpl::SetPaused(bool paused) {
void StreamMixerAlsaInputImpl::SetVolumeMultiplier(float multiplier) {
RUN_ON_MIXER_THREAD(SetVolumeMultiplier, multiplier);
- LOG(INFO) << this << ": stream volume = " << multiplier;
+ LOG(INFO) << device_id_ << "(" << this << "): stream volume = " << multiplier;
DCHECK(!IsDeleting());
if (multiplier > 1.0f)
multiplier = 1.0f;

Powered by Google App Engine
This is Rietveld 408576698