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

Side by Side Diff: media/audio/audio_manager_base.cc

Issue 2795743003: Enable high latency audio on Android N+ for basic playback.
Patch Set: Created 3 years, 8 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/audio/android/opensles_output.cc ('k') | no next file » | 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/audio/audio_manager_base.h" 5 #include "media/audio/audio_manager_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 << ", Frames Per Buffer: " 268 << ", Frames Per Buffer: "
269 << output_params.frames_per_buffer(); 269 << output_params.frames_per_buffer();
270 270
271 // Tell the AudioManager to create a fake output device. 271 // Tell the AudioManager to create a fake output device.
272 output_params = params; 272 output_params = params;
273 output_params.set_format(AudioParameters::AUDIO_FAKE); 273 output_params.set_format(AudioParameters::AUDIO_FAKE);
274 } else if (params.effects() != output_params.effects()) { 274 } else if (params.effects() != output_params.effects()) {
275 // Turn off effects that weren't requested. 275 // Turn off effects that weren't requested.
276 output_params.set_effects(params.effects() & output_params.effects()); 276 output_params.set_effects(params.effects() & output_params.effects());
277 } 277 }
278 output_params.set_latency_tag(params.latency_tag());
278 } 279 }
279 280
280 DispatcherParams* dispatcher_params = 281 DispatcherParams* dispatcher_params =
281 new DispatcherParams(params, output_params, output_device_id); 282 new DispatcherParams(params, output_params, output_device_id);
282 283
283 AudioOutputDispatchers::iterator it = 284 AudioOutputDispatchers::iterator it =
284 std::find_if(output_dispatchers_.begin(), output_dispatchers_.end(), 285 std::find_if(output_dispatchers_.begin(), output_dispatchers_.end(),
285 CompareByParams(dispatcher_params)); 286 CompareByParams(dispatcher_params));
286 if (it != output_dispatchers_.end()) { 287 if (it != output_dispatchers_.end()) {
287 delete dispatcher_params; 288 delete dispatcher_params;
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 std::move(task_runner), std::move(file_task_runner)); 488 std::move(task_runner), std::move(file_task_runner));
488 } 489 }
489 490
490 void AudioManagerBase::SetMaxStreamCountForTesting(int max_input, 491 void AudioManagerBase::SetMaxStreamCountForTesting(int max_input,
491 int max_output) { 492 int max_output) {
492 max_num_output_streams_ = max_output; 493 max_num_output_streams_ = max_output;
493 max_num_input_streams_ = max_input; 494 max_num_input_streams_ = max_input;
494 } 495 }
495 496
496 } // namespace media 497 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/android/opensles_output.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698