| commit | 412ec213b52be2ef0edeba0e1e721b85bd31f0bf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 09 08:44:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 09 08:44:52 2021 +0000 |
| tree | 5799dd282b1f98e8596dddd2bbafc2e5569a6411 | |
| parent | b63889131060572d91653e2dc5a8f4a21f23ffb2 [diff] | |
| parent | 1b8e0f7dd548c2328f5fdf05d45b467895f04ee6 [diff] |
Merge "libaudiohal: Fix initialization of SinkMetadata for HAL V7" am: 1b8e0f7dd5 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1580726 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I78b712e83dec248402d6196e45bfe20ac7df1de4
diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp index 7b6d1f8..da16477 100644 --- a/media/libaudiohal/impl/DeviceHalHidl.cpp +++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
@@ -265,6 +265,10 @@ (void)outputDevice; (void)outputDeviceAddress; #else +#if MAJOR_VERSION >= 7 + (void)HidlUtils::audioChannelMaskFromHal( + AUDIO_CHANNEL_NONE, true /*isInput*/, &sinkMetadata.tracks[0].channelMask); +#endif if (outputDevice != AUDIO_DEVICE_NONE) { DeviceAddress hidlOutputDevice; if (status_t status = CoreUtils::deviceAddressFromHal(