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

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

Merge "Audio: 8x16 concurrency changes"

parents 2d477702 36c0893a

policy_hal/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -30,6 +30,14 @@ ifneq ($(strip $(AUDIO_FEATURE_DISABLED_INCALL_MUSIC)),true) 
LOCAL_CFLAGS += -DAUDIO_EXTN_INCALL_MUSIC_ENABLED

endif





ifeq ($(strip $(TARGET_BOARD_PLATFORM)),msm8916)

LOCAL_CFLAGS += -DVOICE_CONCURRENCY

LOCAL_CFLAGS += -DWFD_CONCURRENCY

endif







include $(BUILD_SHARED_LIBRARY)



endif

policy_hal/AudioPolicyManager.cpp

+443 −3

File changed.

Preview size limit exceeded, changes collapsed.

policy_hal/AudioPolicyManager.h

+11 −0
Original line number Diff line number Diff line
@@ -48,6 +48,17 @@ public: 
                                            uint32_t format,

                                            uint32_t channels,

                                            AudioSystem::audio_in_acoustics acoustics);

        virtual audio_io_handle_t getOutput(AudioSystem::stream_type stream,

                                            uint32_t samplingRate = 0,

                                            uint32_t format = AudioSystem::FORMAT_DEFAULT,

                                            uint32_t channels = 0,

                                            AudioSystem::output_flags flags =

                                                    AudioSystem::OUTPUT_FLAG_INDIRECT,

                                            const audio_offload_info_t *offloadInfo = NULL);



        virtual bool isOffloadSupported(const audio_offload_info_t& offloadInfo);



        virtual void setPhoneState(int state);

protected:

        // return the strategy corresponding to a given stream type

        static routing_strategy getStrategy(AudioSystem::stream_type stream);