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

am: 452d6c498f

Change-Id: I59124a707fb1f85b6506c0995d4810e2f968dfcb
gugelfrei
Chih-Hung Hsieh 6 years ago committed by android-build-merger
commit 90905a15dd

@ -875,7 +875,7 @@ void AudioMixer::process__validate()
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 @@ void AudioMixer::process__validate()
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);
}
}
}

Loading…
Cancel
Save