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

Commit b9b86dcb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio: use FLAG_FAST for non-music stream on WFD"

parents 67ee600b f8f17a37

services/audiopolicy/Android.mk

+0 −4
Original line number Original line Diff line number Diff line
@@ -104,10 +104,6 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY)),true) 
LOCAL_CFLAGS += -DVOICE_CONCURRENCY

LOCAL_CFLAGS += -DVOICE_CONCURRENCY

endif

endif





ifeq ($(strip $(AUDIO_FEATURE_ENABLED_WFD_CONCURRENCY)),true)

LOCAL_CFLAGS += -DWFD_CONCURRENCY

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_RECORD_PLAY_CONCURRENCY)),true)

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_RECORD_PLAY_CONCURRENCY)),true)

LOCAL_CFLAGS += -DRECORD_PLAY_CONCURRENCY

LOCAL_CFLAGS += -DRECORD_PLAY_CONCURRENCY

endif

endif

services/audiopolicy/AudioPolicyManager.cpp

+11 −2
Original line number Original line Diff line number Diff line
@@ -1249,11 +1249,20 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevice( 
    }

    }

#endif

#endif





#ifdef WFD_CONCURRENCY

#ifdef AUDIO_EXTN_AFE_PROXY_ENABLED

    /*

    * WFD audio routes back to target speaker when starting a ringtone playback.

    * This is because primary output is reused for ringtone, so output device is

    * updated based on SONIFICATION strategy for both ringtone and music playback.

    * The same issue is not seen on remoted_submix HAL based WFD audio because

    * primary output is not reused and a new output is created for ringtone playback.

    * Issue is fixed by updating output flag to AUDIO_OUTPUT_FLAG_FAST when there is

    * a non-music stream playback on WFD, so primary output is not reused for ringtone.

    */

    audio_devices_t availableOutputDeviceTypes = mAvailableOutputDevices.types();

    audio_devices_t availableOutputDeviceTypes = mAvailableOutputDevices.types();

    if ((availableOutputDeviceTypes & AUDIO_DEVICE_OUT_PROXY)

    if ((availableOutputDeviceTypes & AUDIO_DEVICE_OUT_PROXY)

          && (stream != AUDIO_STREAM_MUSIC)) {

          && (stream != AUDIO_STREAM_MUSIC)) {

        ALOGD(" WFD mode adding ULL flags for non music stream.. flags: %x ", flags );

        ALOGD("WFD audio: use OUTPUT_FLAG_FAST for non music stream. flags:%x", flags );

        //For voip paths

        //For voip paths

        if(flags & AUDIO_OUTPUT_FLAG_DIRECT)

        if(flags & AUDIO_OUTPUT_FLAG_DIRECT)

            flags = AUDIO_OUTPUT_FLAG_DIRECT;

            flags = AUDIO_OUTPUT_FLAG_DIRECT;