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

Commit f920cd55 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Minor clang fixes" am: 42c6092e 

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

Change-Id: I521f3280008df2cc8af88f09d5fe28f92f08002a
parents 98d0355d 42c6092e

system/bta/le_audio/client.cc

+11 −7
Original line number Original line Diff line number Diff line
@@ -1853,7 +1853,8 @@ class LeAudioClientImpl : public LeAudioClient { 
          lc3_encode(lc3_encoder_left, (const int16_t*)chan_left.data(), 1,

          lc3_encode(lc3_encoder_left, (const int16_t*)chan_left.data(), 1,

                     chan_left_enc.data(), chan_left_enc.size());

                     chan_left_enc.data(), chan_left_enc.size());

        } else {

        } else {

          err |= lc3_encoder->run((const int16_t*)chan_left.data(),

          err |=

              lc3_encoder->run((const int16_t*)chan_left.data(),

                               chan_left_enc.size(), chan_left_enc.data(), 0);

                               chan_left_enc.size(), chan_left_enc.data(), 0);

        }

        }

      }

      }
@@ -1864,7 +1865,8 @@ class LeAudioClientImpl : public LeAudioClient { 
                     chan_right_enc.data(), chan_right_enc.size());

                     chan_right_enc.data(), chan_right_enc.size());





        } else {

        } else {

          err |= lc3_encoder->run((const int16_t*)chan_right.data(),

          err |=

              lc3_encoder->run((const int16_t*)chan_right.data(),

                               chan_right_enc.size(), chan_right_enc.data(), 1);

                               chan_right_enc.size(), chan_right_enc.data(), 1);

        }

        }

      }

      }
@@ -2133,7 +2135,8 @@ class LeAudioClientImpl : public LeAudioClient { 
      lc3_encoder_right_mem = malloc(enc_size);

      lc3_encoder_right_mem = malloc(enc_size);





      lc3_encoder_left = lc3_setup_encoder(dt_us, sr_hz, lc3_encoder_left_mem);

      lc3_encoder_left = lc3_setup_encoder(dt_us, sr_hz, lc3_encoder_left_mem);

      lc3_encoder_right = lc3_setup_encoder(dt_us, sr_hz, lc3_encoder_right_mem);

      lc3_encoder_right =

          lc3_setup_encoder(dt_us, sr_hz, lc3_encoder_right_mem);





    } else {

    } else {

      if (lc3_encoder) {

      if (lc3_encoder) {
@@ -3121,7 +3124,8 @@ void LeAudioClient::Initialize( 
      << ", LE Audio Client requires Bluetooth Audio HAL V2.1 at least. Either "

      << ", LE Audio Client requires Bluetooth Audio HAL V2.1 at least. Either "

         "disable LE Audio Profile, or update your HAL";

         "disable LE Audio Profile, or update your HAL";





  use_new_encoder = osi_property_get_bool("persist.bluetooth.use_new_lc3", true);

  use_new_encoder =

      osi_property_get_bool("persist.bluetooth.use_new_lc3", true);

  LOG(INFO) << "use_new_encoder = " << +use_new_encoder;

  LOG(INFO) << "use_new_encoder = " << +use_new_encoder;





  IsoManager::GetInstance()->Start();

  IsoManager::GetInstance()->Start();