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

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

Issue 2067863003: Mixing audio with different latency requirements (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android test fix Created 4 years, 5 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
« no previous file with comments | « media/media.gyp ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/callback_helpers.h" 14 #include "base/callback_helpers.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/power_monitor/power_monitor.h" 17 #include "base/power_monitor/power_monitor.h"
18 #include "base/single_thread_task_runner.h" 18 #include "base/single_thread_task_runner.h"
19 #include "base/time/default_tick_clock.h" 19 #include "base/time/default_tick_clock.h"
20 #include "build/build_config.h" 20 #include "build/build_config.h"
21 #include "media/base/audio_buffer.h" 21 #include "media/base/audio_buffer.h"
22 #include "media/base/audio_buffer_converter.h" 22 #include "media/base/audio_buffer_converter.h"
23 #include "media/base/audio_hardware_config.h" 23 #include "media/base/audio_latency.h"
24 #include "media/base/audio_splicer.h" 24 #include "media/base/audio_splicer.h"
25 #include "media/base/bind_to_current_loop.h" 25 #include "media/base/bind_to_current_loop.h"
26 #include "media/base/demuxer_stream.h" 26 #include "media/base/demuxer_stream.h"
27 #include "media/base/media_log.h" 27 #include "media/base/media_log.h"
28 #include "media/base/media_switches.h" 28 #include "media/base/media_switches.h"
29 #include "media/base/renderer_client.h" 29 #include "media/base/renderer_client.h"
30 #include "media/base/timestamp_constants.h" 30 #include "media/base/timestamp_constants.h"
31 #include "media/filters/audio_clock.h" 31 #include "media/filters/audio_clock.h"
32 #include "media/filters/decrypting_demuxer_stream.h" 32 #include "media/filters/decrypting_demuxer_stream.h"
33 33
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 // renderer. Browser-side will down-mix to the hardware config. If the 435 // renderer. Browser-side will down-mix to the hardware config. If the
436 // hardware later changes to equal stream channels, browser-side will stop 436 // hardware later changes to equal stream channels, browser-side will stop
437 // down-mixing and use the data from all stream channels. 437 // down-mixing and use the data from all stream channels.
438 ChannelLayout renderer_channel_layout = 438 ChannelLayout renderer_channel_layout =
439 hw_channel_count > stream_channel_count 439 hw_channel_count > stream_channel_count
440 ? hw_channel_layout 440 ? hw_channel_layout
441 : stream->audio_decoder_config().channel_layout(); 441 : stream->audio_decoder_config().channel_layout();
442 442
443 audio_parameters_.Reset(hw_params.format(), renderer_channel_layout, 443 audio_parameters_.Reset(hw_params.format(), renderer_channel_layout,
444 sample_rate, hw_params.bits_per_sample(), 444 sample_rate, hw_params.bits_per_sample(),
445 AudioHardwareConfig::GetHighLatencyBufferSize( 445 media::AudioLatency::GetHighLatencyBufferSize(
446 sample_rate, preferred_buffer_size)); 446 sample_rate, preferred_buffer_size));
447 } 447 }
448 448
449 audio_clock_.reset( 449 audio_clock_.reset(
450 new AudioClock(base::TimeDelta(), audio_parameters_.sample_rate())); 450 new AudioClock(base::TimeDelta(), audio_parameters_.sample_rate()));
451 451
452 audio_buffer_stream_->Initialize( 452 audio_buffer_stream_->Initialize(
453 stream, base::Bind(&AudioRendererImpl::OnAudioBufferStreamInitialized, 453 stream, base::Bind(&AudioRendererImpl::OnAudioBufferStreamInitialized,
454 weak_factory_.GetWeakPtr()), 454 weak_factory_.GetWeakPtr()),
455 cdm_context, base::Bind(&AudioRendererImpl::OnStatisticsUpdate, 455 cdm_context, base::Bind(&AudioRendererImpl::OnStatisticsUpdate,
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
967 DCHECK_NE(buffering_state_, buffering_state); 967 DCHECK_NE(buffering_state_, buffering_state);
968 lock_.AssertAcquired(); 968 lock_.AssertAcquired();
969 buffering_state_ = buffering_state; 969 buffering_state_ = buffering_state;
970 970
971 task_runner_->PostTask( 971 task_runner_->PostTask(
972 FROM_HERE, base::Bind(&AudioRendererImpl::OnBufferingStateChange, 972 FROM_HERE, base::Bind(&AudioRendererImpl::OnBufferingStateChange,
973 weak_factory_.GetWeakPtr(), buffering_state_)); 973 weak_factory_.GetWeakPtr(), buffering_state_));
974 } 974 }
975 975
976 } // namespace media 976 } // namespace media
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698