diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf index e74eff8..eb8805f 100644 --- a/audio/audio_io_policy.conf +++ b/audio/audio_io_policy.conf @@ -95,14 +95,14 @@ outputs { } compress_offload_16 { flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_MP3|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 + formats AUDIO_FORMAT_MP3|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|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 sampling_rates 44100|48000|88200|96000|176400|192000 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|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO + formats AUDIO_FORMAT_MP3|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_PRO|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 sampling_rates 44100|48000|88200|96000|176400|192000 bit_width 24 app_type 69940 @@ -116,7 +116,7 @@ inputs { #yewenliang@MM.Audio, 2020/04/09, remove 11025 series sample rate for normal record #sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 #else - sampling_rates 8000|16000|32000|48000|96000|192000 + sampling_rates 8000|16000|32000|48000 #endif bit_width 16 app_type 69938 @@ -133,4 +133,44 @@ inputs { bit_width 32 app_type 69949 } + record_compress_16 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_16_BIT + #ifndef VENDOR_EDIT + #yewenliang@MM.Audio, 2020/12/30, remove 11025 series sample rate for compress record + #sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000 + #else + sampling_rates 8000|16000|32000|48000 + #endif + bit_width 16 + app_type 69938 + } + record_compress_24 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT + sampling_rates 44100|48000|88200|96000|176400|192000 + bit_width 24 + app_type 69948 + } + record_compress_32 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT + sampling_rates 44100|48000|88200|96000|176400|192000 + bit_width 32 + app_type 69949 + } + voip_tx { + flags AUDIO_INPUT_FLAG_VOIP_TX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 8000|16000|32000|48000 + bit_width 16 + app_type 69946 + } + low_latency_voip_tx { + flags AUDIO_INPUT_FLAG_VOIP_TX|AUDIO_INPUT_FLAG_FAST + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69946 + } } diff --git a/audio/audio_platform_info_intcodec.xml b/audio/audio_platform_info_intcodec.xml index c98e38b..fac9d7b 100644 --- a/audio/audio_platform_info_intcodec.xml +++ b/audio/audio_platform_info_intcodec.xml @@ -1,5 +1,5 @@ - + @@ -64,7 +64,7 @@ - + @@ -82,7 +82,9 @@ + + @@ -94,7 +96,10 @@ + + + @@ -120,26 +125,27 @@ + + + - - - - + + + + - - - - - - + + + + + + + @@ -148,21 +154,63 @@ - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,18 +221,10 @@ - - - @@ -195,48 +235,19 @@ - - - - - - - - - - - - + + + + + + - + - + - - @@ -244,22 +255,21 @@ - - - - - - - - - - - - + + + + + + + + + + + @@ -269,6 +279,10 @@ + + + + @@ -277,6 +291,7 @@ + @@ -285,6 +300,10 @@ + + + + @@ -323,9 +342,9 @@ - - - + + + @@ -349,29 +368,17 @@ - - - + - - - - - - - + + + diff --git a/audio/audio_tuning_mixer.txt b/audio/audio_tuning_mixer.txt index 474f18b..7525ce4 100644 --- a/audio/audio_tuning_mixer.txt +++ b/audio/audio_tuning_mixer.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019, The Linux Foundation. All rights reserved. +# Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -38,8 +38,6 @@ WSA_COMP1 Switch:1 WSA_COMP2 Switch:1 SpkrLeft COMP Switch:1 SpkrRight COMP Switch:1 -SpkrLeft BOOST Switch:1 -SpkrRight BOOST Switch:1 SpkrLeft VISENSE Switch:1 SpkrRight VISENSE Switch:1 SpkrLeft SWR DAC_Port Switch:1 @@ -57,11 +55,207 @@ WSA_COMP1 Switch:0 WSA_COMP2 Switch:0 SpkrLeft COMP Switch:0 SpkrRight COMP Switch:0 -SpkrLeft BOOST Switch:0 -SpkrRight BOOST Switch:0 SpkrLeft VISENSE Switch:0 SpkrRight VISENSE Switch:0 SpkrLeft SWR DAC_Port Switch:0 SpkrRight SWR DAC_Port Switch:0 WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 +#SPKR_PHONE_SPKR_TX_FB_PROT +acdb_dev_id:102 +!Record +Txdevice:0 + +enable +WSA_AIF_VI Mixer WSA_SPKR_VI_1:1 +WSA_AIF_VI Mixer WSA_SPKR_VI_2:1 +WSA_CDC_DMA_0 TX Format:UNPACKED +VI_FEED_TX Channels:Two +WSA_RX_0_VI_FB_LCH_MUX:WSA_CDC_DMA_TX_0 +WSA_RX_0_VI_FB_RCH_MUX:WSA_CDC_DMA_TX_0 +MultiMedia1 Mixer WSA_CDC_DMA_TX_0:1 + + +disable +WSA_AIF_VI Mixer WSA_SPKR_VI_1:0 +WSA_AIF_VI Mixer WSA_SPKR_VI_2:0 +MultiMedia1 Mixer WSA_CDC_DMA_TX_0:0 + +#SPKR_PHONE_SPKR_STEREO_RX_FB_PROT +acdb_dev_id:124 +!Playback +Rxdevice:0 + +enable +WSA_CDC_DMA_RX_0 Channels:Two +WSA RX0 MUX:AIF1_PB +WSA RX1 MUX:AIF1_PB +WSA_RX0 INP0:RX0 +WSA_RX1 INP0:RX1 +WSA_COMP1 Switch:1 +WSA_COMP2 Switch:1 +SpkrLeft COMP Switch:1 +SpkrRight COMP Switch:1 +SpkrLeft VISENSE Switch:1 +SpkrRight VISENSE Switch:1 +SpkrLeft SWR DAC_Port Switch:1 +SpkrRight SWR DAC_Port Switch:1 +WSA_RX0 Digital Volume:62 +WSA_RX1 Digital Volume:62 +WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1 + +disable +WSA RX0 MUX:ZERO +WSA RX1 MUX:ZERO +WSA_RX0 INP0:ZERO +WSA_RX1 INP0:ZERO +WSA_COMP1 Switch:0 +WSA_COMP2 Switch:0 +SpkrLeft COMP Switch:0 +SpkrRight COMP Switch:0 +SpkrLeft VISENSE Switch:0 +SpkrRight VISENSE Switch:0 +SpkrLeft SWR DAC_Port Switch:0 +SpkrRight SWR DAC_Port Switch:0 +WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 + +#SPKR_PHONE_SPKR_TX_FB_PROT_STEREO_MCS +acdb_dev_id:193 +!Record +Txdevice:0 + +enable +WSA_AIF_VI Mixer WSA_SPKR_VI_1:1 +WSA_AIF_VI Mixer WSA_SPKR_VI_2:1 +WSA_CDC_DMA_0 TX Format:UNPACKED +VI_FEED_TX Channels:Two +WSA_RX_0_VI_FB_LCH_MUX:WSA_CDC_DMA_TX_0 +WSA_RX_0_VI_FB_RCH_MUX:WSA_CDC_DMA_TX_0 +MultiMedia1 Mixer WSA_CDC_DMA_TX_0:1 + + +disable +WSA_AIF_VI Mixer WSA_SPKR_VI_1:0 +WSA_AIF_VI Mixer WSA_SPKR_VI_2:0 +MultiMedia1 Mixer WSA_CDC_DMA_TX_0:0 + +#SPKR_PHONE_SPKR_TX_FB_PROT_MONO_L_MCS +acdb_dev_id:194 +!Record +Txdevice:0 + +enable +WSA_AIF_VI Mixer WSA_SPKR_VI_1:1 +WSA_CDC_DMA_0 TX Format:UNPACKED +VI_FEED_TX Channels:One +WSA_RX_0_VI_FB_LCH_MUX:WSA_CDC_DMA_TX_0 +MultiMedia1 Mixer WSA_CDC_DMA_TX_0:1 + +disable +WSA_AIF_VI Mixer WSA_SPKR_VI_1:0 +MultiMedia1 Mixer WSA_CDC_DMA_TX_0:0 + +#SPKR_PHONE_SPKR_TX_FB_PROT_MONO_R_MCS +acdb_dev_id:195 +!Record +Txdevice:0 + +enable +WSA_AIF_VI Mixer WSA_SPKR_VI_2:1 +WSA_CDC_DMA_0 TX Format:UNPACKED +VI_FEED_TX Channels:One +WSA_RX_0_VI_FB_RCH_MUX:WSA_CDC_DMA_TX_0 +MultiMedia1 Mixer WSA_CDC_DMA_TX_0:1 + +disable +WSA_AIF_VI Mixer WSA_SPKR_VI_2:0 +MultiMedia1 Mixer WSA_CDC_DMA_TX_0:0 + +#SPKR_PHONE_SPKR_STEREO_RX_FB_PROT_MCS +acdb_dev_id:196 +!Playback +Rxdevice:0 + +enable +WSA_CDC_DMA_RX_0 Channels:Two +WSA RX0 MUX:AIF1_PB +WSA RX1 MUX:AIF1_PB +WSA_RX0 INP0:RX0 +WSA_RX1 INP0:RX1 +WSA_COMP1 Switch:1 +WSA_COMP2 Switch:1 +SpkrLeft COMP Switch:1 +SpkrRight COMP Switch:1 +SpkrLeft VISENSE Switch:1 +SpkrRight VISENSE Switch:1 +SpkrLeft SWR DAC_Port Switch:1 +SpkrRight SWR DAC_Port Switch:1 +WSA_RX0 Digital Volume:62 +WSA_RX1 Digital Volume:62 +WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1 + +disable +WSA RX0 MUX:ZERO +WSA RX1 MUX:ZERO +WSA_RX0 INP0:ZERO +WSA_RX1 INP0:ZERO +WSA_COMP1 Switch:0 +WSA_COMP2 Switch:0 +SpkrLeft COMP Switch:0 +SpkrRight COMP Switch:0 +SpkrLeft VISENSE Switch:0 +SpkrRight VISENSE Switch:0 +SpkrLeft SWR DAC_Port Switch:0 +SpkrRight SWR DAC_Port Switch:0 +WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 + +#SPKR_PHONE_SPKR_MONO_L_RX_FB_PROT_MCS +acdb_dev_id:197 +!Playback +Rxdevice:0 + +enable +WSA_CDC_DMA_RX_0 Channels:One +WSA RX0 MUX:AIF1_PB +WSA_RX0 INP0:RX0 +WSA_COMP1 Switch:1 +SpkrLeft COMP Switch:1 +SpkrLeft VISENSE Switch:1 +SpkrLeft SWR DAC_Port Switch:1 +WSA_RX0 Digital Volume:62 +WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1 + +disable +WSA RX0 MUX:ZERO +WSA_RX0 INP0:ZERO +WSA_COMP1 Switch:0 +SpkrLeft COMP Switch:0 +SpkrLeft VISENSE Switch:0 +SpkrLeft SWR DAC_Port Switch:0 +WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 + + +#SPKR_PHONE_SPKR_MONO_R_RX_FB_PROT_MCS +acdb_dev_id:198 +!Playback +Rxdevice:0 + +enable +WSA_CDC_DMA_RX_0 Channels:One +WSA RX1 MUX:AIF1_PB +WSA_RX1 INP0:RX1 +WSA_COMP2 Switch:1 +SpkrRight COMP Switch:1 +SpkrRight VISENSE Switch:1 +SpkrRight SWR DAC_Port Switch:1 +WSA_RX1 Digital Volume:62 +WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:1 + +disable +WSA RX1 MUX:ZERO +WSA_RX1 INP0:ZERO +WSA_COMP2 Switch:0 +SpkrRight COMP Switch:0 +SpkrRight VISENSE Switch:0 +SpkrRight SWR DAC_Port Switch:0 +WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1:0 diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml index f5c2a1e..b5692d5 100644 --- a/audio/sound_trigger_mixer_paths.xml +++ b/audio/sound_trigger_mixer_paths.xml @@ -45,6 +45,7 @@ + @@ -53,14 +54,14 @@ - - - - - - - - + + + + + + + + @@ -77,17 +78,38 @@ + - - + + + + + + + + + + + + + + + + + + + + + + @@ -156,101 +178,115 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +--> + + @@ -261,41 +297,36 @@ - - - - - - - - - - - - - - - - - + + + - - - - - - + + + + + + + + + + + + + + + @@ -304,37 +335,67 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + @@ -343,5 +404,4 @@ - diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml index 9008453..b583c8d 100644 --- a/audio/sound_trigger_platform_info.xml +++ b/audio/sound_trigger_platform_info.xml @@ -1,5 +1,5 @@ - + @@ -26,7 +26,7 @@ - + @@ -35,8 +35,11 @@ + + + @@ -49,12 +52,12 @@ - - - + + + @@ -76,8 +79,8 @@ - - + + @@ -98,7 +101,6 @@ - @@ -110,6 +112,7 @@ + @@ -128,7 +131,6 @@ - @@ -140,15 +142,28 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -158,8 +173,7 @@ - - + @@ -170,15 +184,28 @@ + - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -186,15 +213,28 @@ + - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -231,11 +271,13 @@ - - - - - + + + + + + + @@ -244,11 +286,13 @@ - - - - - + + + + + + + @@ -262,7 +306,6 @@ - @@ -270,6 +313,7 @@ + @@ -290,11 +334,13 @@ - - - - - + + + + + + + @@ -316,11 +362,13 @@ - - - - - + + + + + + + @@ -329,11 +377,13 @@ - - - - - + + + + + + + @@ -366,12 +416,14 @@ - - - - - - + + + + + + + + @@ -380,12 +432,14 @@ - - - - - - + + + + + + + + diff --git a/common.mk b/common.mk index 2514403..c37d636 100644 --- a/common.mk +++ b/common.mk @@ -167,7 +167,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml @@ -337,17 +336,17 @@ PRODUCT_PACKAGES += \ # Media PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ - $(LOCAL_PATH)/configs/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ + $(LOCAL_PATH)/configs/media_codecs_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(LOCAL_PATH)/configs/media_codecs_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lahaina.xml \ - $(LOCAL_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + $(LOCAL_PATH)/configs/media_codecs_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lahaina_vendor.xml \ + $(LOCAL_PATH)/configs/media_codecs_performance_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ $(LOCAL_PATH)/configs/media_codecs_performance_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lahaina.xml \ - $(LOCAL_PATH)/configs/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \ + $(LOCAL_PATH)/configs/media_codecs_performance_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lahaina_vendor.xml \ $(LOCAL_PATH)/configs/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \ $(LOCAL_PATH)/configs/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ $(LOCAL_PATH)/configs/media_profiles_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_lahaina.xml \ - $(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \ - $(LOCAL_PATH)/configs/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml + $(LOCAL_PATH)/configs/media_profiles_lahaina.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ + $(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml PRODUCT_COPY_FILES += \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml deleted file mode 100644 index fa3cb5c..0000000 --- a/configs/media_codecs.xml +++ /dev/null @@ -1,491 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/media_codecs_c2.xml b/configs/media_codecs_c2.xml deleted file mode 100644 index 5dca84b..0000000 --- a/configs/media_codecs_c2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/configs/media_codecs_lahaina.xml b/configs/media_codecs_lahaina.xml index e67dfc4..c6f6b95 100644 --- a/configs/media_codecs_lahaina.xml +++ b/configs/media_codecs_lahaina.xml @@ -1,84 +1,27 @@ - - - + + - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + + - - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + - - - - + + + + - + - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/configs/media_codecs_lahaina_vendor.xml b/configs/media_codecs_lahaina_vendor.xml new file mode 100644 index 0000000..2bebf84 --- /dev/null +++ b/configs/media_codecs_lahaina_vendor.xml @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_codecs_performance.xml b/configs/media_codecs_performance.xml deleted file mode 100644 index a8ae2eb..0000000 --- a/configs/media_codecs_performance.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/media_codecs_performance_lahaina.xml b/configs/media_codecs_performance_lahaina.xml index a8ae2eb..1cf72de 100644 --- a/configs/media_codecs_performance_lahaina.xml +++ b/configs/media_codecs_performance_lahaina.xml @@ -1,206 +1,167 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - + + + + + - - - + + + + + + - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_codecs_performance_lahaina_vendor.xml b/configs/media_codecs_performance_lahaina_vendor.xml new file mode 100644 index 0000000..1cf72de --- /dev/null +++ b/configs/media_codecs_performance_lahaina_vendor.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/media_codecs_vendor.xml b/configs/media_codecs_vendor.xml deleted file mode 100644 index e67dfc4..0000000 --- a/configs/media_codecs_vendor.xml +++ /dev/null @@ -1,494 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/media_codecs_vendor_audio.xml b/configs/media_codecs_vendor_audio.xml index 2749bc6..27e5c0b 100644 --- a/configs/media_codecs_vendor_audio.xml +++ b/configs/media_codecs_vendor_audio.xml @@ -18,6 +18,8 @@ + + diff --git a/configs/media_profiles_V1_0.xml b/configs/media_profiles_V1_0.xml index 66128d6..dc4a051 100644 --- a/configs/media_profiles_V1_0.xml +++ b/configs/media_profiles_V1_0.xml @@ -1,5 +1,13 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + - + - + + - + + - + + - - - - - - - + + - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -812,20 +462,14 @@ In other words, the applications won't be able to use the codec or query the capabilities of the codec at all if it is disabled --> - - - - diff --git a/configs/media_profiles_lahaina.xml b/configs/media_profiles_lahaina.xml index 3d95410..b4451ef 100644 --- a/configs/media_profiles_lahaina.xml +++ b/configs/media_profiles_lahaina.xml @@ -1,6 +1,12 @@ - + + + + + + + - - - - - + + + + diff --git a/configs/media_profiles_vendor.xml b/configs/media_profiles_vendor.xml deleted file mode 100644 index 077fbc7..0000000 --- a/configs/media_profiles_vendor.xml +++ /dev/null @@ -1,1821 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -