commit ff7397bb08bf9953615d7b3416f4839bc0b1d2ff
author Mikhail Naganov <mnaganov@google.com> Fri Dec 21 16:53:18 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 21 16:53:18 2018 +0000
tree a53bb2736464538dee178cd6f32e1845ac183b69
parent d4b7efe5b000f1d0c1534690a85242b4de6b54f0
parent d9499eb6d127dc53c8aa3deda05a70b03fc464f3

Merge "Audio HAL: Update for the new definition of SinkMetadata"

media/libaudiohal/impl/DeviceHalHidl.cpp

diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp
index 8537608..7a9e843 100644
--- a/media/libaudiohal/impl/DeviceHalHidl.cpp
+++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
@@ -277,18 +277,18 @@
     HidlUtils::audioConfigFromHal(*config, &hidlConfig);
     Result retval = Result::NOT_INITIALIZED;
 #if MAJOR_VERSION == 2
-    auto sourceMetadata = AudioSource(source);
+    auto sinkMetadata = AudioSource(source);
 #elif MAJOR_VERSION >= 4
     // TODO: correctly propagate the tracks sources and volume
     //       for now, only send the main source at 1dbfs
-    SinkMetadata sourceMetadata = {{{AudioSource(source), 1}}};
+    SinkMetadata sinkMetadata = {{{ .source = AudioSource(source), .gain = 1 }}};
 #endif
     Return<void> ret = mDevice->openInputStream(
             handle,
             hidlDevice,
             hidlConfig,
             EnumBitfield<AudioInputFlag>(flags),
-            sourceMetadata,
+            sinkMetadata,
             [&](Result r, const sp<IStreamIn>& result, const AudioConfig& suggestedConfig) {
                 retval = r;
                 if (retval == Result::OK) {