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

Commit 556335f0 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Gerrit Code Review
Browse files

Merge "LeAudio: Add Codec Extensibility to dumpsys" into main

parents 16bc7170 a85d32c4

system/bta/le_audio/client.cc

+3 −0
Original line number Diff line number Diff line
@@ -3892,6 +3892,9 @@ class LeAudioClientImpl : public LeAudioClient { 
    }

    dprintf(fd, "  Source monitor mode: %s\n",

            source_monitor_mode_ ? "true" : "false");

    dprintf(fd, "  Codec extensibility: %s\n",

            CodecManager::GetInstance()->IsUsingCodecExtensibility() ? "true"

                                                                     : "false");

    dprintf(fd, "  Start time: ");

    for (auto t : stream_start_history_queue_) {

      dprintf(fd, ", %d ms", static_cast<int>(t));

system/bta/le_audio/codec_manager.cc

+8 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ struct codec_manager_impl { 
    }

  }



  static bool IsUsingCodecExtensibility() {

  bool IsUsingCodecExtensibility() const {

    auto codec_ext_status =

        osi_property_get_bool(

            "bluetooth.core.le_audio.codec_extension_aidl.enabled", false) &&
@@ -1345,4 +1345,11 @@ void CodecManager::ClearCisConfiguration(uint8_t direction) { 
  }

}



bool CodecManager::IsUsingCodecExtensibility() const {

  if (pimpl_->IsRunning()) {

    return pimpl_->codec_manager_impl_->IsUsingCodecExtensibility();

  }

  return false;

}



}  // namespace bluetooth::le_audio

system/bta/le_audio/codec_manager.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ class CodecManager { 
      const std::vector<struct types::cis>& cises,

      const stream_parameters& stream_params, uint8_t direction);

  virtual void ClearCisConfiguration(uint8_t direction);

  virtual bool IsUsingCodecExtensibility() const;

  virtual bool UpdateActiveUnicastAudioHalClient(

      LeAudioSourceAudioHalClient* source_unicast_client,

      LeAudioSinkAudioHalClient* sink_unicast_client, bool is_active);

system/bta/le_audio/mock_codec_manager.cc

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ void CodecManager::ClearCisConfiguration(uint8_t direction) { 
  if (pimpl_) return pimpl_->ClearCisConfiguration(direction);

}



bool CodecManager::IsUsingCodecExtensibility() const {

  if (pimpl_) return pimpl_->IsUsingCodecExtensibility();

  return false;

}



std::ostream& operator<<(

    std::ostream& os, const CodecManager::UnicastConfigurationRequirements&) {

  return os;

system/bta/le_audio/mock_codec_manager.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ class MockCodecManager { 
               uint8_t direction),

              (const));

  MOCK_METHOD((void), ClearCisConfiguration, (uint8_t direction));

  MOCK_METHOD((bool), IsUsingCodecExtensibility, (), (const));



  MOCK_METHOD((void), Start, ());

  MOCK_METHOD((void), Stop, ());