From 01c13a1de5a36d673af6ff5ebc21b1befeeef0e3 Mon Sep 17 00:00:00 2001 From: therootlord Date: Mon, 8 Oct 2018 01:28:39 -0300 Subject: [PATCH] sanders: remove audio_output_policy.conf * We're using audio_policy_configuration.xml --- audio/audio_output_policy.conf | 56 ---------------------------------- device.mk | 1 - 2 files changed, 57 deletions(-) delete mode 100644 audio/audio_output_policy.conf diff --git a/audio/audio_output_policy.conf b/audio/audio_output_policy.conf deleted file mode 100644 index 313d36c..0000000 --- a/audio/audio_output_policy.conf +++ /dev/null @@ -1,56 +0,0 @@ -# List of profiles for the output device session where stream is routed. -# A stream opened with the inputs attributes which match the "flags" and -# "formats" as specified in the profile is routed to a device at -# sample rate specified under "sampling_rates" and bit width under -# "bit_width" and the topology extracted from the acdb data against -# the "app_type". -# -# the flags and formats are specified using the strings corresponding to -# enums in audio.h and audio_policy.h. They are concatenated with "|" -# without space or "\n". -# the flags and formats should match the ones in "audio_policy.conf" - -outputs { - default { - flags AUDIO_OUTPUT_FLAG_PRIMARY - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69937 - } - deep_buffer { - flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69936 - } - direct { - flags AUDIO_OUTPUT_FLAG_DIRECT - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 48000 - bit_width 16 - app_type 69936 - } - direct_pcm { - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_DIRECT_PCM - formats AUDIO_FORMAT_PCM_16_BIT - sampling_rates 44100|48000|96000|192000 - bit_width 16 - app_type 69936 - } - compress_offload_16 { - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2 - sampling_rates 44100|48000 - bit_width 16 - app_type 69936 - } - compress_offload_24 { - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS - sampling_rates 44100|48000|96000|192000 - bit_width 24 - app_type 69940 - } -} diff --git a/device.mk b/device.mk index 531959e..525409f 100644 --- a/device.mk +++ b/device.mk @@ -86,7 +86,6 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ - $(LOCAL_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ $(LOCAL_PATH)/audio/audio_ext_spkr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_ext_spkr.conf \