korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-30 23:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

android/hal-audio: Fix invalid memory access when downmixing to mono

Browse Source 
While iterating over input buffer frame's size was not correctly taken
into account. Input buffer is always PCM 16bit stereo (4 bytes per
frame).
This commit is contained in:
Andrei Emeltchenko 2014-05-22 16:07:02 +03:00 committed by Szymon Janc
parent 56a9685d81
commit 510aae0f8e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/hal-audio.c
View File

@ -527,9 +527,12 @@ static void downmix_to_mono(struct a2dp_stream_out *out, const uint8_t *buffer,
{
const int16_t *input = (const void *) buffer;
int16_t *output = (void *) out->downmix_buf;
size_t i;
size_t i, frames;
for (i = 0; i < bytes / 2; i++) {
/* PCM 16bit stereo */
frames = bytes / (2 * sizeof(int16_t));
for (i = 0; i < frames; i++) {
int16_t l = le16_to_cpu(get_unaligned(&input[i * 2]));
int16_t r = le16_to_cpu(get_unaligned(&input[i * 2 + 1]));