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

Commit a07869e2 authored by Bharath's avatar Bharath
Browse files

Merge branch '234devices-r-FP3-MR1' into 'v1-r' 

FP3: Update to MR1

See merge request !39
parents 997189ac 48623cff

BoardConfig.mk

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true 
AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := false

AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := false

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

AUDIO_FEATURE_ENABLED_SSR := false
@@ -237,7 +237,7 @@ TARGET_PER_MGR_ENABLED := true 
TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/recovery.fstab



# Vendor Security Patch Level

VENDOR_SECURITY_PATCH := "2022-04-05"

VENDOR_SECURITY_PATCH := "2022-06-05"



# NFC

BOARD_NFC_CHIPSET := pn553

audio/audio_output_policy.conf

0 → 100644
+63 −0
Original line number Diff line number Diff line 
# 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

  }

  voip_rx {

    flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 8000|16000|32000|48000

    bit_width 16

    app_type 69946

  }

  deep_buffer {

    flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 48000

    bit_width 16

    app_type 69936

  }

  direct_pcm_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    bit_width 16

    app_type 69936

  }

  direct_pcm_24 {

    flags AUDIO_OUTPUT_FLAG_DIRECT

    formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

    sampling_rates 44100|48000|96000|192000

    bit_width 24

    app_type 69940

  }

  compress_offload_16 {

    flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING

    formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_FLAC|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|96000|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_FLAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS

    sampling_rates 44100|48000|96000|192000

    bit_width 24

    app_type 69940

  }

}

audio/audio_policy.conf

0 → 100644
+172 −0
Original line number Diff line number Diff line 
# 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

# - defines whether the speaker output path uses DRC

# "TRUE" means DRC is enabled, "FALSE" or omission means DRC isn't used.

global_configuration {

  attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_TELEPHONY_TX

  default_output_device AUDIO_DEVICE_OUT_SPEAKER

  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_FM_TUNER|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_TELEPHONY_RX



  speaker_drc_enabled TRUE

}



# 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.<device>.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 44100|48000

        channel_masks AUDIO_CHANNEL_OUT_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_FM

        flags AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST

      }

      raw {

        sampling_rates 48000

        channel_masks AUDIO_CHANNEL_OUT_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY

        flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW

      }

      deep_buffer {

         sampling_rates 44100|48000

         channel_masks AUDIO_CHANNEL_OUT_STEREO

         formats AUDIO_FORMAT_PCM_16_BIT

         devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY

         flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER

      }

      direct_pcm {

        sampling_rates 8000|11025|16000|22050|32000|44100|48000|64000|88200|96000|176400|192000

        channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1

        formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT

        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_AUX_DIGITAL

        flags AUDIO_OUTPUT_FLAG_DIRECT

      }

      compress_offload {

        sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000|176400|192000

        channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1

        formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_FLAC|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

        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY

        flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING

      }

      incall_music {

        sampling_rates 8000|16000|48000

        channel_masks AUDIO_CHANNEL_OUT_MONO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO

        flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_INCALL_MUSIC

      }

      voice_tx {

        sampling_rates 8000|16000|48000

        channel_masks AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_MONO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_TELEPHONY_TX

      }

      voip_rx {

        sampling_rates 8000|16000

        channel_masks AUDIO_CHANNEL_OUT_MONO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO

        flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX

      }

    }

    inputs {

      primary {

        sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000

        channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_FM_TUNER|AUDIO_DEVICE_IN_VOICE_CALL

      }

      surround_sound {

        sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000

        channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK|AUDIO_CHANNEL_INDEX_MASK_3|AUDIO_CHANNEL_INDEX_MASK_4|AUDIO_CHANNEL_IN_5POINT1

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC

      }

      record_24 {

        sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|96000|192000

        channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK|AUDIO_CHANNEL_INDEX_MASK_3|AUDIO_CHANNEL_INDEX_MASK_4

        formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_FLOAT

        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET

      }

      voice_rx {

        sampling_rates 8000|16000|48000

        channel_masks AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_MONO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_IN_TELEPHONY_RX

      }

    }

  }

  a2dp {

    outputs {

      a2dp {

        sampling_rates 44100

        channel_masks AUDIO_CHANNEL_OUT_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_ALL_A2DP

      }

    }

    inputs {

      a2dp {

        sampling_rates 44100|48000

        channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_IN_BLUETOOTH_A2DP

       }

     }

  }

  usb {

    outputs {

      usb_accessory {

        sampling_rates 44100

        channel_masks AUDIO_CHANNEL_OUT_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_OUT_USB_ACCESSORY

      }

      usb_device {

        sampling_rates dynamic

        channel_masks dynamic

        formats dynamic

        devices AUDIO_DEVICE_OUT_USB_DEVICE

      }

    }

    inputs {

      usb_device {

        sampling_rates dynamic

        channel_masks AUDIO_CHANNEL_IN_STEREO

        formats AUDIO_FORMAT_PCM_16_BIT

        devices AUDIO_DEVICE_IN_USB_DEVICE

      }

    }

  }

  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

      }

    }

  }

}

audio/audio_policy_configuration.xml

+0 −3
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_FLAC"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_ALAC"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>

                    <profile name="" format="AUDIO_FORMAT_APE"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

audio_properties.mk

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 


#enable software decoders for ALAC and APE.

PRODUCT_PROPERTY_OVERRIDES += \

    vendor.audio.use.sw.alac.decoder=true\

    vendor.audio.use.sw.alac.decoder=false \

    vendor.audio.use.sw.ape.decoder=true



#property for AudioSphere Post processing