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

Commit 67f12daa authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "Add support for 48_2 config which octets per frame is 100." into main am: 1ee6b95e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2749944



Change-Id: I645faac6f8a28e8bac0da0607c67c54dfa84d4d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17764dc3 1ee6b95e

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ std::unordered_map<int32_t, uint16_t> octets_per_frame_map{ 
    {40, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen40},

    {60, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen60},

    {80, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen80},

    {100, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen100},

    {120, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen120}};



std::unordered_map<AudioLocation, uint32_t> audio_location_map{

system/bta/le_audio/le_audio_types.h

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ constexpr uint16_t kLeAudioCodecLC3FrameLen30 = 30; 
constexpr uint16_t kLeAudioCodecLC3FrameLen40 = 40;

constexpr uint16_t kLeAudioCodecLC3FrameLen60 = 60;

constexpr uint16_t kLeAudioCodecLC3FrameLen80 = 80;

constexpr uint16_t kLeAudioCodecLC3FrameLen100 = 100;

constexpr uint16_t kLeAudioCodecLC3FrameLen120 = 120;



}  // namespace codec_spec_conf