mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-17 08:56:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve debug

Browse source
This commit is contained in:
Wim Taymans 2020-12-06 09:32:12 +01:00
parent 6d494c120f
commit 316a96d501
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spa/plugins/bluez5/a2dp-sink.c
View file

@ -595,9 +595,10 @@ static void a2dp_on_timeout(struct spa_source *source)
static int do_start(struct impl *this) static int do_start(struct impl *this)
{ {
int res, val; int i, res, val, size;
struct port *port; struct port *port;
socklen_t len; socklen_t len;
uint8_t *conf;
if (this->started) if (this->started)
return 0; return 0;
@ -613,6 +614,12 @@ static int do_start(struct impl *this)
port = &this->port; port = &this->port;
conf = this->transport->configuration;
size = this->transport->configuration_len;
for (i = 0; i < size; i++)
spa_log_debug(this->log, " %d: %02x", i, conf[i]);
this->codec_data = this->codec->init(this->codec, 0, this->codec_data = this->codec->init(this->codec, 0,
this->transport->configuration, this->transport->configuration,
this->transport->configuration_len, this->transport->configuration_len,

20
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -45,6 +45,7 @@
#include <spa/utils/type.h> #include <spa/utils/type.h>
#include <spa/utils/keys.h> #include <spa/utils/keys.h>
#include <spa/utils/names.h> #include <spa/utils/names.h>
#include <spa/utils/result.h>
#include "a2dp-codecs.h" #include "a2dp-codecs.h"
#include "defs.h" #include "defs.h"
@ -112,7 +113,7 @@ static DBusHandlerResult endpoint_select_configuration(DBusConnection *conn, DBu
uint8_t *pconf = (uint8_t *) config; uint8_t *pconf = (uint8_t *) config;
DBusMessage *r; DBusMessage *r;
DBusError err; DBusError err;
int size, res; int i, size, res;
const struct a2dp_codec *codec; const struct a2dp_codec *codec;
dbus_error_init(&err); dbus_error_init(&err);
@ -126,6 +127,8 @@ static DBusHandlerResult endpoint_select_configuration(DBusConnection *conn, DBu
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} }
spa_log_info(monitor->log, "%p: %s select conf %d", monitor, path, size); spa_log_info(monitor->log, "%p: %s select conf %d", monitor, path, size);
for (i = 0; i < size; i++)
spa_log_debug(monitor->log, " %d: %02x", i, cap[i]);
codec = a2dp_endpoint_to_codec(path); codec = a2dp_endpoint_to_codec(path);
if (codec != NULL) if (codec != NULL)
@ -133,13 +136,16 @@ static DBusHandlerResult endpoint_select_configuration(DBusConnection *conn, DBu
else else
res = -ENOTSUP; res = -ENOTSUP;
if (res < 0) { if (res < 0 || res != size) {
spa_log_error(monitor->log, "can't select config: %d (%s)",
res, spa_strerror(res));
if ((r = dbus_message_new_error(m, "org.bluez.Error.InvalidArguments", if ((r = dbus_message_new_error(m, "org.bluez.Error.InvalidArguments",
"Unable to select configuration")) == NULL) "Unable to select configuration")) == NULL)
return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_NEED_MEMORY;
goto exit_send; goto exit_send;
} }
size = res; for (i = 0; i < size; i++)
spa_log_debug(monitor->log, " %d: %02x", i, pconf[i]);
if ((r = dbus_message_new_method_return(m)) == NULL) if ((r = dbus_message_new_method_return(m)) == NULL)
return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_NEED_MEMORY;
@ -784,8 +790,8 @@ static int transport_update_props(struct spa_bt_transport *transport,
} }
else if (strcmp(key, "Configuration") == 0) { else if (strcmp(key, "Configuration") == 0) {
DBusMessageIter iter; DBusMessageIter iter;
char *value; uint8_t *value;
int len; int i, len;
if (!check_iter_signature(&it[1], "ay")) if (!check_iter_signature(&it[1], "ay"))
goto next; goto next;
@ -794,6 +800,8 @@ static int transport_update_props(struct spa_bt_transport *transport,
dbus_message_iter_get_fixed_array(&iter, &value, &len); dbus_message_iter_get_fixed_array(&iter, &value, &len);
spa_log_debug(monitor->log, "transport %p: %s=%d", transport, key, len); spa_log_debug(monitor->log, "transport %p: %s=%d", transport, key, len);
for (i = 0; i < len; i++)
spa_log_debug(monitor->log, " %d: %02x", i, value[i]);
free(transport->configuration); free(transport->configuration);
transport->configuration_len = 0; transport->configuration_len = 0;
@ -961,8 +969,8 @@ static DBusHandlerResult endpoint_set_configuration(DBusConnection *conn,
spa_bt_transport_set_implementation(transport, &transport_impl, transport); spa_bt_transport_set_implementation(transport, &transport_impl, transport);
} }
transport_update_props(transport, &it[1], NULL);
transport->a2dp_codec = codec; transport->a2dp_codec = codec;
transport_update_props(transport, &it[1], NULL);
if (transport->device == NULL) { if (transport->device == NULL) {
spa_log_warn(monitor->log, "no device found for transport"); spa_log_warn(monitor->log, "no device found for transport");

4
src/modules/module-protocol-native.c
View file

@ -371,7 +371,7 @@ static void on_server_need_flush(void *data)
struct client_data *this = data; struct client_data *this = data;
struct pw_impl_client *client = this->client; struct pw_impl_client *client = this->client;
pw_log_debug("need flush"); pw_log_trace("need flush");
this->need_flush = true; this->need_flush = true;
if (this->source && !(this->source->mask & SPA_IO_OUT)) { if (this->source && !(this->source->mask & SPA_IO_OUT)) {
@ -831,7 +831,7 @@ static void on_client_need_flush(void *data)
{ {
struct client *impl = data; struct client *impl = data;
pw_log_debug("need flush"); pw_log_trace("need flush");
impl->need_flush = true; impl->need_flush = true;
if (impl->source && !(impl->source->mask & SPA_IO_OUT)) { if (impl->source && !(impl->source->mask & SPA_IO_OUT)) {