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

Commit 57daa9e3 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: I8a3fea6d117a898c865940865a3677bab4df7018
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d23ee8c4 4e0e14e2
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -2316,8 +2316,8 @@ class LeAudioClientImpl : public LeAudioClient {
      std::vector<uint16_t> mixed(left->size() * 2);

      for (size_t i = 0; i < left->size(); i++) {
        mixed[2 * i] = (*left)[i];
        mixed[2 * i + 1] = (*right)[i];
        mixed[2 * i] = (*right)[i];
        mixed[2 * i + 1] = (*left)[i];
      }
      to_write = sizeof(int16_t) * mixed.size();
      written =
@@ -2338,8 +2338,8 @@ class LeAudioClientImpl : public LeAudioClient {
      std::vector<uint16_t> mixed(mono_size * 2);

      for (size_t i = 0; i < mono_size; i++) {
        mixed[2 * i] = left ? (*left)[i] : 0;
        mixed[2 * i + 1] = right ? (*right)[i] : 0;
        mixed[2 * i] = right ? (*right)[i] : 0;
        mixed[2 * i + 1] = left ? (*left)[i] : 0;
      }
      to_write = sizeof(int16_t) * mixed.size();
      written =