diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-10-30 10:31:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-30 10:31:06 +0000 |
| commit | 2384b55ab31c49fb5babce058237c27ed28ed53e (patch) | |
| tree | 8a15e1aff54ab1831d925dd86d9ba33c9cdad223 /services/audioflinger/AudioFlinger.cpp | |
| parent | 9df2742a0dc6eb1e4aea2905487722dc60d537cf (diff) | |
| parent | 1f4b82a20d75b5aa8d7801d342ac3a9b48fa0863 (diff) | |
| download | frameworks_av-2384b55ab31c49fb5babce058237c27ed28ed53e.zip frameworks_av-2384b55ab31c49fb5babce058237c27ed28ed53e.tar.gz frameworks_av-2384b55ab31c49fb5babce058237c27ed28ed53e.tar.bz2 | |
am 1f4b82a2: am b14e6dc8: Merge "Always use an address for remote submix" into lmp-mr1-dev automerge: 6e8212b
* commit '1f4b82a20d75b5aa8d7801d342ac3a9b48fa0863':
Always use an address for remote submix
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index d2ef047..a23a729 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1979,13 +1979,13 @@ sp<AudioFlinger::RecordThread> AudioFlinger::openInput_l(audio_module_handle_t m status_t status = inHwHal->open_input_stream(inHwHal, *input, device, &halconfig, &inStream, flags, address.string(), source); ALOGV("openInput_l() openInputStream returned input %p, SamplingRate %d" - ", Format %#x, Channels %x, flags %#x, status %d", + ", Format %#x, Channels %x, flags %#x, status %d addr %s", inStream, halconfig.sample_rate, halconfig.format, halconfig.channel_mask, flags, - status); + status, address.string()); // If the input could not be opened with the requested parameters and we can handle the // conversion internally, try to open again with the proposed parameters. The AudioFlinger can |