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

Commit 2ae957ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "leaudio: replace magic number" into main

parents 67973e98 59f1cf27

system/bta/le_audio/codec_manager.cc

+2 −2
Original line number Diff line number Diff line
@@ -926,7 +926,6 @@ private: 
                     conf.codec.id.coding_format, conf.codec.GetSamplingFrequencyHz(),

                     conf.codec.GetDataIntervalUs(), conf.codec.GetChannelCountPerIsoStream());



          /* TODO: How to get bits_per_sample ? */

          btle_audio_codec_config_t capa_to_add = {

                  .codec_type =

                          (conf.codec.id.coding_format == types::kLeAudioCodingFormatLC3)
@@ -934,7 +933,8 @@ private: 
                                  : btle_audio_codec_index_t::LE_AUDIO_CODEC_INDEX_SOURCE_INVALID,

                  .sample_rate = utils::translateToBtLeAudioCodecConfigSampleRate(

                          conf.codec.GetSamplingFrequencyHz()),

                  .bits_per_sample = utils::translateToBtLeAudioCodecConfigBitPerSample(16),

                  .bits_per_sample = utils::translateToBtLeAudioCodecConfigBitPerSample(

                          conf.codec.GetBitsPerSample()),

                  .channel_count = utils::translateToBtLeAudioCodecConfigChannelCount(

                          conf.codec.GetChannelCountPerIsoStream()),

                  .frame_duration = utils::translateToBtLeAudioCodecConfigFrameDuration(

system/bta/le_audio/le_audio_types_test.cc

+18 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 


#include <vector>



#include "le_audio_utils.h"



namespace bluetooth::le_audio {

namespace types {
@@ -822,5 +824,21 @@ TEST(CodecSpecTest, test_channel_count_transition) { 
            codec_spec_caps::kLeAudioCodecChannelCountEightChannel);

}



TEST(CodecConfigTest, test_lc3_bits_per_sample) {

  set_configurations::CodecConfigSetting lc3_codec_config = {

          .id = {.coding_format = types::kLeAudioCodingFormatLC3},

  };

  ASSERT_EQ(utils::translateToBtLeAudioCodecConfigBitPerSample(lc3_codec_config.GetBitsPerSample()),

            LE_AUDIO_BITS_PER_SAMPLE_INDEX_16);

}



TEST(CodecConfigTest, test_invalid_codec_bits_per_sample) {

  set_configurations::CodecConfigSetting invalid_codec_config = {

          .id = {.coding_format = types::kLeAudioCodingFormatVendorSpecific}};

  ASSERT_EQ(utils::translateToBtLeAudioCodecConfigBitPerSample(

                    invalid_codec_config.GetBitsPerSample()),

            LE_AUDIO_BITS_PER_SAMPLE_INDEX_NONE);

}



}  // namespace types

}  // namespace bluetooth::le_audio

system/bta/le_audio/le_audio_utils.cc

+2 −1
Original line number Diff line number Diff line
@@ -334,7 +334,8 @@ void fillStreamParamsToBtLeAudioCodecConfig( 


  out_config.sample_rate =

          translateToBtLeAudioCodecConfigSampleRate(config.GetSamplingFrequencyHz());

  out_config.bits_per_sample = translateToBtLeAudioCodecConfigBitPerSample(16);

  out_config.bits_per_sample =

          translateToBtLeAudioCodecConfigBitPerSample(config.GetBitsPerSample());

  out_config.frame_duration =

          translateToBtLeAudioCodecConfigFrameDuration(config.GetDataIntervalUs());

  out_config.octets_per_frame = config.GetOctetsPerFrame();