commit 90905a15dd62a30f5de0857ff30b64c23a78d11f
author Chih-Hung Hsieh <chh@google.com> Tue Aug 21 10:23:10 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 21 10:23:10 2018 -0700
tree 504031ed1f449b88d6c417d7cfc5c932c0709d87
parent 26c8d449358d84343145d226c49fe771af6972f5
parent 452d6c498f9d4ab64bd6f0fe27bd63eeb5e5f68f

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

Change-Id: I59124a707fb1f85b6506c0995d4810e2f968dfcb

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);
                 }
             }
         }