commit | 26e1639d0fec6736000dd66112ee4b2ab0d35ed3 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 09 12:44:33 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 09 12:44:33 2021 +0000 |
tree | 7ce8f3854f3deb19cd2dde76d3bf94189347418d | |
parent | 5aa6e1c010f3d4bab1f8db9a2d142bc6a740ab7d [diff] | |
parent | 7516d6d11dc7a4b41b0d2f3707302e6e875ba448 [diff] |
Merge "libaudiohal: Fix initialization of SinkMetadata for HAL V7" am: 1b8e0f7dd5 am: 412ec213b5 am: 7516d6d11d Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1580726 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I52fb2ca5efdd4f81479cc4c858ca936c88ceca64
diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp index a8fbe58..b9a3e29 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(