korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-11 21:14:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

android/hal-sco: Add downmix support to SCO HAL

Browse Source
This commit is contained in:
Andrei Emeltchenko 2014-05-12 11:57:07 +03:00 committed by Luiz Augusto von Dentz
parent effd53a0ff
commit 397f4ba12f
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
android/hal-sco.c
View File

@ -28,6 +28,7 @@
#include <hardware/audio.h>
#include <hardware/hardware.h>
#include "../src/shared/util.h"
#include "sco-msg.h"
#include "ipc-common.h"
#include "hal-log.h"
@ -36,6 +37,7 @@
#define AUDIO_STREAM_DEFAULT_FORMAT AUDIO_FORMAT_PCM_16_BIT
#define OUT_BUFFER_SIZE 2560
#define OUT_STREAM_FRAMES 2560
static int listen_sk = -1;
static int ipc_sk = -1;
@ -46,6 +48,7 @@ static pthread_mutex_t sk_mutex = PTHREAD_MUTEX_INITIALIZER;
struct sco_audio_config {
uint32_t rate;
uint32_t channels;
uint32_t frame_num;
uint16_t mtu;
audio_format_t format;
};
@ -55,6 +58,8 @@ struct sco_stream_out {
struct sco_audio_config cfg;
int fd;
uint8_t *downmix_buf;
};
struct sco_dev {
@ -233,15 +238,35 @@ static int ipc_connect_sco(int *fd, uint16_t *mtu)
/* Audio stream functions */
static void downmix_to_mono(struct sco_stream_out *out, const uint8_t *buffer,
size_t frame_num)
{
const int16_t *input = (const void *) buffer;
int16_t *output = (void *) out->downmix_buf;
size_t i;
for (i = 0; i < frame_num; i++) {
int16_t l = le16_to_cpu(get_unaligned(&input[i * 2]));
int16_t r = le16_to_cpu(get_unaligned(&input[i * 2 + 1]));
put_unaligned(cpu_to_le16((l + r) >> 1), &output[i]);
}
}
static ssize_t out_write(struct audio_stream_out *stream, const void *buffer,
size_t bytes)
{
struct sco_stream_out *out = (struct sco_stream_out *) stream;
/* write data */
size_t frame_num = bytes / audio_stream_frame_size(&out->stream.common);
DBG("write to fd %d bytes %zu", out->fd, bytes);
if (!out->downmix_buf) {
error("sco: downmix buffer not initialized");
return -1;
}
downmix_to_mono(out, buffer, frame_num);
return bytes;
}
@ -263,9 +288,13 @@ static int out_set_sample_rate(struct audio_stream *stream, uint32_t rate)
static size_t out_get_buffer_size(const struct audio_stream *stream)
{
DBG("buf size %u", OUT_BUFFER_SIZE);
struct sco_stream_out *out = (struct sco_stream_out *) stream;
size_t size = audio_stream_frame_size(&out->stream.common) *
out->cfg.frame_num;
return OUT_BUFFER_SIZE;
DBG("buf size %zd", size);
return size;
}
static uint32_t out_get_channels(const struct audio_stream *stream)
@ -407,8 +436,16 @@ static int sco_open_output_stream(struct audio_hw_device *dev,
out->cfg.format = AUDIO_STREAM_DEFAULT_FORMAT;
out->cfg.channels = AUDIO_CHANNEL_OUT_MONO;
out->cfg.rate = AUDIO_STREAM_DEFAULT_RATE;
out->cfg.frame_num = OUT_STREAM_FRAMES;
out->cfg.mtu = mtu;
out->downmix_buf = malloc(out_get_buffer_size(&out->stream.common));
if (!out->downmix_buf) {
free(out);
return -ENOMEM;
}
DBG("size %zd", out_get_buffer_size(&out->stream.common));
*stream_out = &out->stream;
adev->out = out;
out->fd = fd;
@ -420,6 +457,7 @@ static void sco_close_output_stream(struct audio_hw_device *dev,
struct audio_stream_out *stream_out)
{
struct sco_dev *sco_dev = (struct sco_dev *) dev;
struct sco_stream_out *out = (struct sco_stream_out *) stream_out;
DBG("dev %p stream %p fd %d", dev, stream_out, sco_dev->out->fd);
@ -428,7 +466,8 @@ static void sco_close_output_stream(struct audio_hw_device *dev,
sco_dev->out->fd = -1;
}
free(stream_out);
free(out->downmix_buf);
free(out);
sco_dev->out = NULL;
}