From a6a42ba862951b8059cbc553b5a5cb07405b98bc Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Thu, 19 Nov 2020 17:02:43 +0100 Subject: [WIP] Audio: use Android x86 audio Signed-off-by: Denis 'GNUtoo' Carikli --- audio_policy.conf | 64 ------------------------------------------------------- init.smdk4x12.rc | 2 +- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 audio_policy.conf diff --git a/audio_policy.conf b/audio_policy.conf deleted file mode 100644 index 0945c25..0000000 --- a/audio_policy.conf +++ /dev/null @@ -1,64 +0,0 @@ -# -# Audio policy configuration for generic device builds (goldfish audio HAL - emulator) -# - -# Global configuration section: lists input and output devices always present on the device -# as well as the output device selected by default. -# Devices are designated by a string that corresponds to the enum in audio.h - -global_configuration { - attached_output_devices AUDIO_DEVICE_OUT_SPEAKER - default_output_device AUDIO_DEVICE_OUT_SPEAKER - attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX -} - -# audio hardware module section: contains descriptors for all audio hw modules present on the -# device. Each hw module node is named after the corresponding hw module library base name. -# For instance, "primary" corresponds to audio.primary..so. -# The "primary" module is mandatory and must include at least one output with -# AUDIO_OUTPUT_FLAG_PRIMARY flag. -# Each module descriptor contains one or more output profile descriptors and zero or more -# input profile descriptors. Each profile lists all the parameters supported by a given output -# or input stream category. -# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding -# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n". - -audio_hw_modules { - primary { - outputs { - primary { - sampling_rates 8000|11025|16000|22050|24000|44100|48000 - channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_WIRED_HEADSET - flags AUDIO_OUTPUT_FLAG_PRIMARY - } - } - inputs { - primary { - sampling_rates 8000|11025|16000|22050|44100|48000 - channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET - } - } - } - r_submix { - outputs { - submix { - sampling_rates 48000 - channel_masks AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_REMOTE_SUBMIX - } - } - inputs { - submix { - sampling_rates 48000 - channel_masks AUDIO_CHANNEL_IN_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_REMOTE_SUBMIX - } - } - } -} diff --git a/init.smdk4x12.rc b/init.smdk4x12.rc index 97dbeb7..81114be 100644 --- a/init.smdk4x12.rc +++ b/init.smdk4x12.rc @@ -16,7 +16,7 @@ on boot # Audio support - setprop ro.hardware.audio.primary i9300 + setprop ro.hardware.audio.primary x86 # adb support mkdir /dev/usb-ffs 0770 shell shell mkdir /dev/usb-ffs/adb 0770 shell shell -- cgit v1.2.3