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

Commit dbc57a71 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: update low frequency logging" am: 0373af7d am: 38c9802d am: 0413c2e3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1701665

Change-Id: If656bd5768bab1965c45e105ea7d618f9e2ed319
parents 4ef945d8 0413c2e3

services/audioflinger/Threads.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -815,7 +815,7 @@ String8 channelMaskToString(audio_channel_mask_t mask, bool output) { 
            if (mask & AUDIO_CHANNEL_OUT_FRONT_LEFT) s.append("front-left, ");

            if (mask & AUDIO_CHANNEL_OUT_FRONT_LEFT) s.append("front-left, ");

            if (mask & AUDIO_CHANNEL_OUT_FRONT_RIGHT) s.append("front-right, ");

            if (mask & AUDIO_CHANNEL_OUT_FRONT_RIGHT) s.append("front-right, ");

            if (mask & AUDIO_CHANNEL_OUT_FRONT_CENTER) s.append("front-center, ");

            if (mask & AUDIO_CHANNEL_OUT_FRONT_CENTER) s.append("front-center, ");

            if (mask & AUDIO_CHANNEL_OUT_LOW_FREQUENCY) s.append("low freq, ");

            if (mask & AUDIO_CHANNEL_OUT_LOW_FREQUENCY) s.append("low-frequency, ");

            if (mask & AUDIO_CHANNEL_OUT_BACK_LEFT) s.append("back-left, ");

            if (mask & AUDIO_CHANNEL_OUT_BACK_LEFT) s.append("back-left, ");

            if (mask & AUDIO_CHANNEL_OUT_BACK_RIGHT) s.append("back-right, ");

            if (mask & AUDIO_CHANNEL_OUT_BACK_RIGHT) s.append("back-right, ");

            if (mask & AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER) s.append("front-left-of-center, ");

            if (mask & AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER) s.append("front-left-of-center, ");
@@ -835,7 +835,7 @@ String8 channelMaskToString(audio_channel_mask_t mask, bool output) { 
            if (mask & AUDIO_CHANNEL_OUT_BOTTOM_FRONT_LEFT) s.append("bottom-front-left, ");

            if (mask & AUDIO_CHANNEL_OUT_BOTTOM_FRONT_LEFT) s.append("bottom-front-left, ");

            if (mask & AUDIO_CHANNEL_OUT_BOTTOM_FRONT_CENTER) s.append("bottom-front-center, ");

            if (mask & AUDIO_CHANNEL_OUT_BOTTOM_FRONT_CENTER) s.append("bottom-front-center, ");

            if (mask & AUDIO_CHANNEL_OUT_BOTTOM_FRONT_RIGHT) s.append("bottom-front-right, ");

            if (mask & AUDIO_CHANNEL_OUT_BOTTOM_FRONT_RIGHT) s.append("bottom-front-right, ");

            if (mask & AUDIO_CHANNEL_OUT_LOW_FREQUENCY_2) s.append("low_frequency_2, ");

            if (mask & AUDIO_CHANNEL_OUT_LOW_FREQUENCY_2) s.append("low-frequency-2, ");

            if (mask & AUDIO_CHANNEL_OUT_HAPTIC_B) s.append("haptic-B, ");

            if (mask & AUDIO_CHANNEL_OUT_HAPTIC_B) s.append("haptic-B, ");

            if (mask & AUDIO_CHANNEL_OUT_HAPTIC_A) s.append("haptic-A, ");

            if (mask & AUDIO_CHANNEL_OUT_HAPTIC_A) s.append("haptic-A, ");

            if (mask & ~AUDIO_CHANNEL_OUT_ALL) s.append("unknown,  ");

            if (mask & ~AUDIO_CHANNEL_OUT_ALL) s.append("unknown,  ");
@@ -855,7 +855,7 @@ String8 channelMaskToString(audio_channel_mask_t mask, bool output) { 
            if (mask & AUDIO_CHANNEL_IN_BACK_LEFT) s.append("back-left, ");

            if (mask & AUDIO_CHANNEL_IN_BACK_LEFT) s.append("back-left, ");

            if (mask & AUDIO_CHANNEL_IN_BACK_RIGHT) s.append("back-right, ");

            if (mask & AUDIO_CHANNEL_IN_BACK_RIGHT) s.append("back-right, ");

            if (mask & AUDIO_CHANNEL_IN_CENTER) s.append("center, ");

            if (mask & AUDIO_CHANNEL_IN_CENTER) s.append("center, ");

            if (mask & AUDIO_CHANNEL_IN_LOW_FREQUENCY) s.append("low freq, ");

            if (mask & AUDIO_CHANNEL_IN_LOW_FREQUENCY) s.append("low-frequency, ");

            if (mask & AUDIO_CHANNEL_IN_TOP_LEFT) s.append("top-left, ");

            if (mask & AUDIO_CHANNEL_IN_TOP_LEFT) s.append("top-left, ");

            if (mask & AUDIO_CHANNEL_IN_TOP_RIGHT) s.append("top-right, ");

            if (mask & AUDIO_CHANNEL_IN_TOP_RIGHT) s.append("top-right, ");

            if (mask & AUDIO_CHANNEL_IN_VOICE_UPLINK) s.append("voice-uplink, ");

            if (mask & AUDIO_CHANNEL_IN_VOICE_UPLINK) s.append("voice-uplink, ");