Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1949fae2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix undefined error in ALOGV_IF."

parents 8553f11f 3c604275

media/libaudioprocessing/AudioMixer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

                }

            }

        }