mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-02 09:01:50 -05:00
bluez5: adjust sco-source behavior as a follower
Don't try to drive as a follower, specify latency when AG, and bump up number of buffers to allow process being called less often.
This commit is contained in:
parent
eb7df98cd6
commit
b19bd74b22
1 changed files with 31 additions and 10 deletions
|
|
@ -110,6 +110,7 @@ struct impl {
|
||||||
struct port port;
|
struct port port;
|
||||||
|
|
||||||
unsigned int started:1;
|
unsigned int started:1;
|
||||||
|
unsigned int following:1;
|
||||||
|
|
||||||
struct spa_io_clock *clock;
|
struct spa_io_clock *clock;
|
||||||
struct spa_io_position *position;
|
struct spa_io_position *position;
|
||||||
|
|
@ -216,9 +217,15 @@ static int impl_node_enum_params(void *object, int seq,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline bool is_following(struct impl *this)
|
||||||
|
{
|
||||||
|
return this->position && this->clock && this->position->clock.id != this->clock->id;
|
||||||
|
}
|
||||||
|
|
||||||
static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
|
static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
|
||||||
{
|
{
|
||||||
struct impl *this = object;
|
struct impl *this = object;
|
||||||
|
bool following;
|
||||||
|
|
||||||
spa_return_val_if_fail(this != NULL, -EINVAL);
|
spa_return_val_if_fail(this != NULL, -EINVAL);
|
||||||
|
|
||||||
|
|
@ -233,6 +240,12 @@ static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
following = is_following(this);
|
||||||
|
if (this->started && following != this->following) {
|
||||||
|
spa_log_debug(this->log, NAME" %p: reassign follower %d->%d", this, this->following, following);
|
||||||
|
this->following = following;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -471,7 +484,7 @@ static int sco_source_cb(void *userdata, uint8_t *read_data, int size_read)
|
||||||
struct port *port = &this->port;
|
struct port *port = &this->port;
|
||||||
struct spa_io_buffers *io = port->io;
|
struct spa_io_buffers *io = port->io;
|
||||||
struct spa_data *datas;
|
struct spa_data *datas;
|
||||||
uint32_t max_out_size;
|
uint32_t min_data;
|
||||||
|
|
||||||
if (this->transport == NULL) {
|
if (this->transport == NULL) {
|
||||||
spa_log_debug(this->log, "no transport, stop reading");
|
spa_log_debug(this->log, "no transport, stop reading");
|
||||||
|
|
@ -490,12 +503,6 @@ static int sco_source_cb(void *userdata, uint8_t *read_data, int size_read)
|
||||||
}
|
}
|
||||||
datas = port->current_buffer->buf->datas;
|
datas = port->current_buffer->buf->datas;
|
||||||
|
|
||||||
if (this->transport->codec == HFP_AUDIO_CODEC_MSBC) {
|
|
||||||
max_out_size = MSBC_DECODED_SIZE;
|
|
||||||
} else {
|
|
||||||
max_out_size = this->transport->read_mtu;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* update the current pts */
|
/* update the current pts */
|
||||||
spa_system_clock_gettime(this->data_system, CLOCK_MONOTONIC, &this->now);
|
spa_system_clock_gettime(this->data_system, CLOCK_MONOTONIC, &this->now);
|
||||||
|
|
||||||
|
|
@ -513,7 +520,8 @@ static int sco_source_cb(void *userdata, uint8_t *read_data, int size_read)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* send buffer if full */
|
/* send buffer if full */
|
||||||
if ((max_out_size + port->ready_offset) > (this->props.max_latency * port->frame_size)) {
|
min_data = SPA_MIN(this->props.min_latency * port->frame_size, datas[0].maxsize / 2);
|
||||||
|
if (port->ready_offset >= min_data) {
|
||||||
uint64_t sample_count;
|
uint64_t sample_count;
|
||||||
|
|
||||||
datas[0].chunk->offset = 0;
|
datas[0].chunk->offset = 0;
|
||||||
|
|
@ -524,7 +532,7 @@ static int sco_source_cb(void *userdata, uint8_t *read_data, int size_read)
|
||||||
spa_list_append(&port->ready, &port->current_buffer->link);
|
spa_list_append(&port->ready, &port->current_buffer->link);
|
||||||
port->current_buffer = NULL;
|
port->current_buffer = NULL;
|
||||||
|
|
||||||
if (this->clock) {
|
if (!this->following && this->clock) {
|
||||||
this->clock->nsec = SPA_TIMESPEC_TO_NSEC(&this->now);
|
this->clock->nsec = SPA_TIMESPEC_TO_NSEC(&this->now);
|
||||||
this->clock->duration = sample_count * this->clock->rate.denom / port->current_format.info.raw.rate;
|
this->clock->duration = sample_count * this->clock->rate.denom / port->current_format.info.raw.rate;
|
||||||
this->clock->position += this->clock->duration;
|
this->clock->position += this->clock->duration;
|
||||||
|
|
@ -538,6 +546,9 @@ static int sco_source_cb(void *userdata, uint8_t *read_data, int size_read)
|
||||||
if (spa_list_is_empty(&port->ready))
|
if (spa_list_is_empty(&port->ready))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (this->following)
|
||||||
|
return 0;
|
||||||
|
|
||||||
/* process the buffer if IO does not have any */
|
/* process the buffer if IO does not have any */
|
||||||
if (io->status != SPA_STATUS_HAVE_DATA) {
|
if (io->status != SPA_STATUS_HAVE_DATA) {
|
||||||
struct buffer *b;
|
struct buffer *b;
|
||||||
|
|
@ -584,6 +595,11 @@ static int do_start(struct impl *this)
|
||||||
if (this->started)
|
if (this->started)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
this->following = is_following(this);
|
||||||
|
|
||||||
|
spa_log_debug(this->log, NAME" %p: start following:%d",
|
||||||
|
this, this->following);
|
||||||
|
|
||||||
/* Make sure the transport is valid */
|
/* Make sure the transport is valid */
|
||||||
spa_return_val_if_fail (this->transport != NULL, -EIO);
|
spa_return_val_if_fail (this->transport != NULL, -EIO);
|
||||||
|
|
||||||
|
|
@ -693,9 +709,11 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
|
||||||
static void emit_node_info(struct impl *this, bool full)
|
static void emit_node_info(struct impl *this, bool full)
|
||||||
{
|
{
|
||||||
bool is_ag = this->transport && (this->transport->profile & SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY);
|
bool is_ag = this->transport && (this->transport->profile & SPA_BT_PROFILE_HEADSET_AUDIO_GATEWAY);
|
||||||
|
char latency[64] = "128/8000";
|
||||||
struct spa_dict_item ag_node_info_items[] = {
|
struct spa_dict_item ag_node_info_items[] = {
|
||||||
{ SPA_KEY_DEVICE_API, "bluez5" },
|
{ SPA_KEY_DEVICE_API, "bluez5" },
|
||||||
{ SPA_KEY_MEDIA_CLASS, "Stream/Output/Audio" },
|
{ SPA_KEY_MEDIA_CLASS, "Stream/Output/Audio" },
|
||||||
|
{ SPA_KEY_NODE_LATENCY, latency },
|
||||||
{ "media.name", ((this->transport && this->transport->device->name) ?
|
{ "media.name", ((this->transport && this->transport->device->name) ?
|
||||||
this->transport->device->name : "HSP/HFP") },
|
this->transport->device->name : "HSP/HFP") },
|
||||||
};
|
};
|
||||||
|
|
@ -708,6 +726,9 @@ static void emit_node_info(struct impl *this, bool full)
|
||||||
if (full)
|
if (full)
|
||||||
this->info.change_mask = this->info_all;
|
this->info.change_mask = this->info_all;
|
||||||
if (this->info.change_mask) {
|
if (this->info.change_mask) {
|
||||||
|
if (this->transport && this->port.have_format)
|
||||||
|
snprintf(latency, sizeof(latency), "%d/%d", (int)this->props.min_latency,
|
||||||
|
(int)this->port.current_format.info.raw.rate);
|
||||||
this->info.props = is_ag ?
|
this->info.props = is_ag ?
|
||||||
&SPA_DICT_INIT_ARRAY(ag_node_info_items) :
|
&SPA_DICT_INIT_ARRAY(ag_node_info_items) :
|
||||||
&SPA_DICT_INIT_ARRAY(hu_node_info_items);
|
&SPA_DICT_INIT_ARRAY(hu_node_info_items);
|
||||||
|
|
@ -853,7 +874,7 @@ impl_node_port_enum_params(void *object, int seq,
|
||||||
|
|
||||||
param = spa_pod_builder_add_object(&b,
|
param = spa_pod_builder_add_object(&b,
|
||||||
SPA_TYPE_OBJECT_ParamBuffers, id,
|
SPA_TYPE_OBJECT_ParamBuffers, id,
|
||||||
SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(2, 1, MAX_BUFFERS),
|
SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 8, MAX_BUFFERS),
|
||||||
SPA_PARAM_BUFFERS_blocks, SPA_POD_Int(1),
|
SPA_PARAM_BUFFERS_blocks, SPA_POD_Int(1),
|
||||||
SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(
|
SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(
|
||||||
this->props.max_latency * port->frame_size,
|
this->props.max_latency * port->frame_size,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue