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

Side by Side Diff: media/renderers/audio_renderer_impl.cc

Issue 2837613004: media: Support better decoder switching (Closed)
Patch Set: Mock*Decoder name Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/renderers/audio_renderer_impl.h" 5 #include "media/renderers/audio_renderer_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 349
350 // Trying to track down AudioClock crash, http://crbug.com/674856. 350 // Trying to track down AudioClock crash, http://crbug.com/674856.
351 // AudioRenderImpl should only be initialized once to avoid destroying 351 // AudioRenderImpl should only be initialized once to avoid destroying
352 // AudioClock while the audio thread is still using it. 352 // AudioClock while the audio thread is still using it.
353 CHECK_EQ(audio_clock_.get(), nullptr); 353 CHECK_EQ(audio_clock_.get(), nullptr);
354 354
355 state_ = kInitializing; 355 state_ = kInitializing;
356 client_ = client; 356 client_ = client;
357 357
358 audio_buffer_stream_ = base::MakeUnique<AudioBufferStream>( 358 audio_buffer_stream_ = base::MakeUnique<AudioBufferStream>(
359 task_runner_, create_audio_decoders_cb_.Run(), media_log_); 359 task_runner_, create_audio_decoders_cb_, media_log_);
360 360
361 audio_buffer_stream_->set_config_change_observer(base::Bind( 361 audio_buffer_stream_->set_config_change_observer(base::Bind(
362 &AudioRendererImpl::OnConfigChange, weak_factory_.GetWeakPtr())); 362 &AudioRendererImpl::OnConfigChange, weak_factory_.GetWeakPtr()));
363 363
364 // Always post |init_cb_| because |this| could be destroyed if initialization 364 // Always post |init_cb_| because |this| could be destroyed if initialization
365 // failed. 365 // failed.
366 init_cb_ = BindToCurrentLoop(init_cb); 366 init_cb_ = BindToCurrentLoop(init_cb);
367 367
368 auto output_device_info = sink_->GetOutputDeviceInfo(); 368 auto output_device_info = sink_->GetOutputDeviceInfo();
369 const AudioParameters& hw_params = output_device_info.output_params(); 369 const AudioParameters& hw_params = output_device_info.output_params();
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 // All channels with a zero mix are muted and can be ignored. 1009 // All channels with a zero mix are muted and can be ignored.
1010 std::vector<bool> channel_mask(audio_parameters_.channels(), false); 1010 std::vector<bool> channel_mask(audio_parameters_.channels(), false);
1011 for (size_t ch = 0; ch < matrix.size(); ++ch) { 1011 for (size_t ch = 0; ch < matrix.size(); ++ch) {
1012 channel_mask[ch] = std::any_of(matrix[ch].begin(), matrix[ch].end(), 1012 channel_mask[ch] = std::any_of(matrix[ch].begin(), matrix[ch].end(),
1013 [](float mix) { return !!mix; }); 1013 [](float mix) { return !!mix; });
1014 } 1014 }
1015 algorithm_->SetChannelMask(std::move(channel_mask)); 1015 algorithm_->SetChannelMask(std::move(channel_mask));
1016 } 1016 }
1017 1017
1018 } // namespace media 1018 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698