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

Side by Side Diff: media/audio/android/audio_manager_android.cc

Issue 1907973003: media: Move audio_parameters and audio_point to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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/alsa/audio_manager_alsa.cc ('k') | media/audio/android/audio_record_input.h » ('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/audio/android/audio_manager_android.h" 5 #include "media/audio/android/audio_manager_android.h"
6 6
7 #include "base/android/build_info.h" 7 #include "base/android/build_info.h"
8 #include "base/android/context_utils.h" 8 #include "base/android/context_utils.h"
9 #include "base/android/jni_array.h" 9 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "jni/AudioManagerAndroid_jni.h" 16 #include "jni/AudioManagerAndroid_jni.h"
17 #include "media/audio/android/audio_record_input.h" 17 #include "media/audio/android/audio_record_input.h"
18 #include "media/audio/android/opensles_input.h" 18 #include "media/audio/android/opensles_input.h"
19 #include "media/audio/android/opensles_output.h" 19 #include "media/audio/android/opensles_output.h"
20 #include "media/audio/audio_manager.h" 20 #include "media/audio/audio_manager.h"
21 #include "media/audio/audio_parameters.h"
22 #include "media/audio/fake_audio_input_stream.h" 21 #include "media/audio/fake_audio_input_stream.h"
22 #include "media/base/audio_parameters.h"
23 #include "media/base/channel_layout.h" 23 #include "media/base/channel_layout.h"
24 24
25 using base::android::AppendJavaStringArrayToStringVector; 25 using base::android::AppendJavaStringArrayToStringVector;
26 using base::android::AttachCurrentThread; 26 using base::android::AttachCurrentThread;
27 using base::android::ConvertJavaStringToUTF8; 27 using base::android::ConvertJavaStringToUTF8;
28 using base::android::ConvertUTF8ToJavaString; 28 using base::android::ConvertUTF8ToJavaString;
29 using base::android::ScopedJavaLocalRef; 29 using base::android::ScopedJavaLocalRef;
30 30
31 namespace media { 31 namespace media {
32 namespace { 32 namespace {
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 output_volume_override_ = volume; 412 output_volume_override_ = volume;
413 413
414 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); 414 DCHECK(GetTaskRunner()->BelongsToCurrentThread());
415 for (OutputStreams::iterator it = streams_.begin(); 415 for (OutputStreams::iterator it = streams_.begin();
416 it != streams_.end(); ++it) { 416 it != streams_.end(); ++it) {
417 (*it)->SetVolume(volume); 417 (*it)->SetVolume(volume);
418 } 418 }
419 } 419 }
420 420
421 } // namespace media 421 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/alsa/audio_manager_alsa.cc ('k') | media/audio/android/audio_record_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698