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

Commit 23f31590 authored by Grzegorz Kolodziejczyk's avatar Grzegorz Kolodziejczyk Committed by Gerrit Code Review
Browse files

Merge changes Ib9ac4ec1,I89bff9e3,I8c271837,Ib7eb7bf1,I40b58de8 into main 

* changes:
  le_audio: Handle re-configuration case while sink monitoring
  le_audio: native Sink Monitoring tests
  le_audio: Use unified unicast monitorig status
  le_audio: Correct streaming request notification for sink monitoring
  le_audio: Fix stream typo
parents 0fe91483 37791bec

system/bta/le_audio/client.cc

+12 −4
Original line number Diff line number Diff line
@@ -4241,7 +4241,7 @@ class LeAudioClientImpl : public LeAudioClient { 


  void notifyAudioLocalSink(UnicastMonitorModeStatus status) {

    if (sink_monitor_notified_status_ != status) {

      LOG_INFO("Stram monitoring status changed to: %d",

      LOG_INFO("Stream monitoring status changed to: %d",

               static_cast<int>(status));

      sink_monitor_notified_status_ = status;

      callbacks_->OnUnicastMonitorModeStatus(
@@ -4263,7 +4263,8 @@ class LeAudioClientImpl : public LeAudioClient { 


    if (sink_monitor_mode_ &&

        active_group_id_ == bluetooth::groups::kGroupUnknown) {

      if (!sink_monitor_notified_status_) {

      if (sink_monitor_notified_status_ !=

          UnicastMonitorModeStatus::STREAMING_REQUESTED) {

        notifyAudioLocalSink(UnicastMonitorModeStatus::STREAMING_REQUESTED);

      }

      CancelLocalAudioSinkStreamingRequest();
@@ -5488,6 +5489,14 @@ class LeAudioClientImpl : public LeAudioClient { 
                kLeAudioContextAllRemoteSource.test(configuration_context_type_)

                    ? le_audio::types::kLeAudioDirectionSource

                    : le_audio::types::kLeAudioDirectionSink;



            /* Reconfiguration to non requiring source scenario */

            if (sink_monitor_mode_ &&

                (remote_direction == le_audio::types::kLeAudioDirectionSink)) {

              notifyAudioLocalSink(

                  UnicastMonitorModeStatus::STREAMING_SUSPENDED);

            }



            auto remote_contexts =

                DirectionalRealignMetadataAudioContexts(group, remote_direction);

            ApplyRemoteMetadataAudioContextPolicy(group, remote_contexts,
@@ -5502,8 +5511,7 @@ class LeAudioClientImpl : public LeAudioClient { 
            group->ClearPendingConfiguration();

          } else {

            if (sink_monitor_mode_) {

              callbacks_->OnUnicastMonitorModeStatus(

                  le_audio::types::kLeAudioDirectionSink,

              notifyAudioLocalSink(

                  UnicastMonitorModeStatus::STREAMING_SUSPENDED);

            }

          }

system/bta/le_audio/le_audio_client_test.cc

+458 −2

File changed.

Preview size limit exceeded, changes collapsed.