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

Commit 15832117 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "LE Audio: pass left/right microphone audio in proper order" am:... 

Merge "LE Audio: pass left/right microphone audio in proper order" am: e1aee659 am: 908ad876 am: a91e4d4f am: 4e0e14e2

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



Change-Id: I9530b1374d0ec65d1ae89559cd4ee43b8773f176
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 903b6472 4e0e14e2

system/bta/le_audio/client.cc

+4 −4
Original line number Original line Diff line number Diff line
@@ -2316,8 +2316,8 @@ class LeAudioClientImpl : public LeAudioClient { 
      std::vector<uint16_t> mixed(left->size() * 2);

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





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

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

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

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

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

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

      }

      }

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

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

      written =

      written =
@@ -2338,8 +2338,8 @@ class LeAudioClientImpl : public LeAudioClient { 
      std::vector<uint16_t> mixed(mono_size * 2);

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





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

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

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

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

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

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

      }

      }

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

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

      written =

      written =