commit 452d6c498f9d4ab64bd6f0fe27bd63eeb5e5f68f
author Chih-Hung Hsieh <chh@google.com> Tue Aug 21 10:18:57 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 21 10:18:57 2018 -0700
tree 10cae3426a0a5aecbba55536e5b1c032eeef57a7
parent 303b3375e5e8473649f4517677f1d66787b29e86
parent 1949fae278542569c538282a11e65cbe54c45618

Merge "Fix undefined error in ALOGV_IF."
am: 1949fae278

Change-Id: Ia1c398425ea6c034d2bd2eccf2cc7beedf59212c

media/libaudioprocessing/AudioMixer.cpp

diff --git a/media/libaudioprocessing/AudioMixer.cpp b/media/libaudioprocessing/AudioMixer.cpp
index f6f817a..f3ea826 100644
--- a/media/libaudioprocessing/AudioMixer.cpp
+++ b/media/libaudioprocessing/AudioMixer.cpp
@@ -875,7 +875,7 @@
                 t->hook = Track::getTrackHook(TRACKTYPE_RESAMPLE, t->mMixerChannelCount,
                         t->mMixerInFormat, t->mMixerFormat);
                 ALOGV_IF((n & NEEDS_CHANNEL_COUNT__MASK) > NEEDS_CHANNEL_2,
-                        "Track %d needs downmix + resample", i);
+                        "Track %d needs downmix + resample", name);
             } else {
                 if ((n & NEEDS_CHANNEL_COUNT__MASK) == NEEDS_CHANNEL_1){
                     t->hook = Track::getTrackHook(
@@ -890,7 +890,7 @@
                     t->hook = Track::getTrackHook(TRACKTYPE_NORESAMPLE, t->mMixerChannelCount,
                             t->mMixerInFormat, t->mMixerFormat);
                     ALOGV_IF((n & NEEDS_CHANNEL_COUNT__MASK) > NEEDS_CHANNEL_2,
-                            "Track %d needs downmix", i);
+                            "Track %d needs downmix", name);
                 }
             }
         }