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

Commit 1a8baed3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I83468115,I8226c327 

* changes:
  leaudio: Remove hidden requirement for the sample frequency
  leaudio/provider: Improve dumpsys
parents ea06bb3a 96f76a86

system/bta/le_audio/le_audio_set_configuration_provider_json.cc

+4 −2
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ struct AudioSetConfigurationProvider::impl { 


    for (LeAudioContextType context : types::kLeAudioContextAllTypesArray) {

      auto confs = Get()->GetConfigurations(context);

      stream << "  === Configurations for context type: " << (int)context

      stream << "\n  === Configurations for context type: " << (int)context

             << ", num: " << (confs == nullptr ? 0 : confs->size()) << " \n";

      if (confs->size() > 0) {

        for (const auto& conf : *confs) {
@@ -527,7 +527,9 @@ struct AudioSetConfigurationProvider::impl { 
                   << "     qos->retransmission_number: "

                   << +ent.qos.retransmission_number << " \n"

                   << "     qos->max_transport_latency: "

                   << +ent.qos.max_transport_latency << " \n";

                   << +ent.qos.max_transport_latency << " \n"

                   << "     channel count: "

                   << +ent.codec.GetConfigChannelCount() << "\n";

          }

        }

      }

system/bta/le_audio/le_audio_types.cc

+1 −3
Original line number Diff line number Diff line
@@ -122,9 +122,7 @@ static bool IsCodecConfigurationSupported(const types::LeAudioLtvMap& pacs, 
  DLOG(INFO) << __func__ << " Pac:SamplFreq=" << loghex(u16_pac_val);



  /* TODO: Integrate with codec capabilities */

  if ((u8_req_val != codec_spec_conf::kLeAudioSamplingFreq16000Hz &&

       u8_req_val != codec_spec_conf::kLeAudioSamplingFreq48000Hz) ||

      !(u16_pac_val &

  if (!(u16_pac_val &

        codec_spec_caps::SamplingFreqConfig2Capability(u8_req_val))) {

    DLOG(ERROR) << __func__ << ", sampling frequency not supported";

    return false;