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

Commit 4612696a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BluetoothAudio: Refine the FMQ size for A2DP software encoding" into sc-dev am: b56f0871 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15426430

Change-Id: Ic2f54429739eb8475138393d984353412dfe2e98
parents 05318001 b56f0871

bluetooth/audio/2.0/default/A2dpSoftwareAudioProvider.cpp

+6 −2
Original line number Diff line number Diff line
@@ -32,10 +32,14 @@ namespace implementation { 
using ::android::bluetooth::audio::BluetoothAudioSessionReport;

using ::android::hardware::Void;



// Here the buffer size is based on SBC

static constexpr uint32_t kPcmFrameSize = 4;  // 16 bits per sample / stereo

static constexpr uint32_t kPcmFrameCount = 128;

// SBC is 128, and here choose the LCM of 16, 24, and 32

static constexpr uint32_t kPcmFrameCount = 96;

static constexpr uint32_t kRtpFrameSize = kPcmFrameSize * kPcmFrameCount;

static constexpr uint32_t kRtpFrameCount = 7;  // max counts by 1 tick (20ms)

// The max counts by 1 tick (20ms) for SBC is about 7. Since using 96 for the

// PCM counts, here we just choose a greater number

static constexpr uint32_t kRtpFrameCount = 10;

static constexpr uint32_t kBufferSize = kRtpFrameSize * kRtpFrameCount;

static constexpr uint32_t kBufferCount = 2;  // double buffer

static constexpr uint32_t kDataMqSize = kBufferSize * kBufferCount;

bluetooth/audio/2.1/default/A2dpSoftwareAudioProvider.cpp

+6 −2
Original line number Diff line number Diff line
@@ -34,10 +34,14 @@ using ::android::bluetooth::audio::BluetoothAudioSessionReport_2_1; 
using ::android::hardware::Void;

using ::android::hardware::bluetooth::audio::V2_0::AudioConfiguration;



// Here the buffer size is based on SBC

static constexpr uint32_t kPcmFrameSize = 4;  // 16 bits per sample / stereo

static constexpr uint32_t kPcmFrameCount = 128;

// SBC is 128, and here we choose the LCM of 16, 24, and 32

static constexpr uint32_t kPcmFrameCount = 96;

static constexpr uint32_t kRtpFrameSize = kPcmFrameSize * kPcmFrameCount;

static constexpr uint32_t kRtpFrameCount = 7;  // max counts by 1 tick (20ms)

// The max counts by 1 tick (20ms) for SBC is about 7. Since using 96 for the

// PCM counts, here we just choose a greater number

static constexpr uint32_t kRtpFrameCount = 10;

static constexpr uint32_t kBufferSize = kRtpFrameSize * kRtpFrameCount;

static constexpr uint32_t kBufferCount = 2;  // double buffer

static constexpr uint32_t kDataMqSize = kBufferSize * kBufferCount;