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

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

Merge "leaudio: Improve handling microphone during call" am: 672030e9 

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



Change-Id: I707d354f7ab9ef0fa26e84f428d739b3da6b90e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 00bf3e3c 672030e9

system/bta/le_audio/client.cc

+21 −30
Original line number Diff line number Diff line
@@ -2427,41 +2427,32 @@ class LeAudioClientImpl : public LeAudioClient { 
                         std::vector<int16_t>* right) {

    uint16_t to_write = 0;

    uint16_t written = 0;

    if (!bt_got_stereo && !af_is_stereo) {

    if (!af_is_stereo) {

      if (!bt_got_stereo) {

        std::vector<int16_t>* mono = left ? left : right;

        /* mono audio over bluetooth, audio framework expects mono */

        to_write = sizeof(int16_t) * mono->size();

        written =

            leAudioClientAudioSink->SendData((uint8_t*)mono->data(), to_write);

    } else if (bt_got_stereo && af_is_stereo) {

      /* stero audio over bluetooth, audio framework expects stereo */

      std::vector<uint16_t> mixed(left->size() * 2);



      for (size_t i = 0; i < left->size(); i++) {

        mixed[2 * i] = (*right)[i];

        mixed[2 * i + 1] = (*left)[i];

      }

      to_write = sizeof(int16_t) * mixed.size();

      written =

          leAudioClientAudioSink->SendData((uint8_t*)mixed.data(), to_write);

    } else if (bt_got_stereo && !af_is_stereo) {

      /* stero audio over bluetooth, audio framework expects mono */

      std::vector<uint16_t> mixed(left->size() * 2);



      } else {

        /* stereo audio over bluetooth, audio framework expects mono */

        for (size_t i = 0; i < left->size(); i++) {

          (*left)[i] = ((*left)[i] + (*right)[i]) / 2;

        }

        to_write = sizeof(int16_t) * left->size();

        written =

            leAudioClientAudioSink->SendData((uint8_t*)left->data(), to_write);

    } else if (!bt_got_stereo && af_is_stereo) {

      /* mono audio over bluetooth, audio framework expects stereo */

      }

    } else {

      /* mono audio over bluetooth, audio framework expects stereo

       * Here we handle stream without checking bt_got_stereo flag.

       */

      const size_t mono_size = left ? left->size() : right->size();

      std::vector<uint16_t> mixed(mono_size * 2);



      for (size_t i = 0; i < mono_size; i++) {

        mixed[2 * i] = right ? (*right)[i] : 0;

        mixed[2 * i + 1] = left ? (*left)[i] : 0;

        mixed[2 * i] = left ? (*left)[i] : (*right)[i];

        mixed[2 * i + 1] = right ? (*right)[i] : (*left)[i];

      }

      to_write = sizeof(int16_t) * mixed.size();

      written =