diff --git a/pipewire-pulseaudio/src/context.c b/pipewire-pulseaudio/src/context.c index b00524218..0f4c70dbc 100644 --- a/pipewire-pulseaudio/src/context.c +++ b/pipewire-pulseaudio/src/context.c @@ -840,6 +840,7 @@ static void on_success(pa_operation *o, void *userdata) { struct success_data *d = userdata; pa_context *c = o->context; + pw_log_debug("context %p: error %d", c, d->error); if (d->error != 0) pa_context_set_error(c, d->error); if (d->cb) diff --git a/pipewire-pulseaudio/src/internal.h b/pipewire-pulseaudio/src/internal.h index c2088be44..4ef5fa933 100644 --- a/pipewire-pulseaudio/src/internal.h +++ b/pipewire-pulseaudio/src/internal.h @@ -152,11 +152,15 @@ do { \ #define PA_FAIL(context, error) \ do { \ - return -pa_context_set_error((context), (error)); \ + pw_log_debug("fail at %s:%u %s()", \ + , __FILE__, __LINE__, __func__); \ + return -pa_context_set_error((context), (error)); \ } while(false) #define PA_FAIL_RETURN_ANY(context, error, value) \ do { \ + pw_log_debug("fail at %s:%u %s()", \ + , __FILE__, __LINE__, __func__); \ pa_context_set_error((context), (error)); \ return value; \ } while(false) diff --git a/pipewire-pulseaudio/src/introspect.c b/pipewire-pulseaudio/src/introspect.c index d9c6d9569..526ddda8e 100644 --- a/pipewire-pulseaudio/src/introspect.c +++ b/pipewire-pulseaudio/src/introspect.c @@ -37,6 +37,7 @@ static void on_success(pa_operation *o, void *userdata) { struct success_ack *d = userdata; pa_context *c = o->context; + pw_log_debug("error:%d", d->error); if (d->error != 0) pa_context_set_error(c, d->error); if (d->cb) diff --git a/pipewire-pulseaudio/src/stream.c b/pipewire-pulseaudio/src/stream.c index 8b2d84f02..87da005cc 100644 --- a/pipewire-pulseaudio/src/stream.c +++ b/pipewire-pulseaudio/src/stream.c @@ -449,7 +449,7 @@ static void update_timing_info(pa_stream *s) pw_stream_get_time(s->stream, &pwt); s->timing_info_valid = false; s->queued = pwt.queued; - pw_log_trace("stream %p: %"PRIu64, s, s->queued); + pw_log_debug("stream %p: %"PRIu64" rate:%d", s, s->queued, pwt.rate.denom); if (pwt.rate.denom == 0) return; @@ -1334,6 +1334,7 @@ pa_operation* pa_stream_drain(pa_stream *s, pa_stream_success_cb_t cb, void *use pw_log_debug("stream %p", s); pw_stream_flush(s->stream, true); + update_timing_info(s); o = pa_operation_new(s->context, s, on_success, sizeof(struct success_ack)); d = o->userdata; d->cb = cb; diff --git a/spa/plugins/audioconvert/channelmix.c b/spa/plugins/audioconvert/channelmix.c index ba041ca12..651928a04 100644 --- a/spa/plugins/audioconvert/channelmix.c +++ b/spa/plugins/audioconvert/channelmix.c @@ -903,6 +903,9 @@ static int impl_node_process(void *object) db->datas[i].chunk->size = n_samples * outport->stride; } + spa_log_trace_fp(this->log, NAME " %p: n_src:%d n_dst:%d n_samples:%d p:%d", + this, n_src_datas, n_dst_datas, n_samples, is_passthrough); + if (!is_passthrough) channelmix_process(&this->mix, n_dst_datas, dst_datas, n_src_datas, src_datas, n_samples); diff --git a/spa/plugins/audioconvert/merger.c b/spa/plugins/audioconvert/merger.c index 0a2b8e435..decb27c90 100644 --- a/spa/plugins/audioconvert/merger.c +++ b/spa/plugins/audioconvert/merger.c @@ -1006,9 +1006,11 @@ static int impl_node_process(void *object) dbuf->buf->datas[i].data = dst_datas[i]; dbuf->buf->datas[i].chunk->offset = 0; dbuf->buf->datas[i].chunk->size = n_samples * outport->stride; - spa_log_trace_fp(this->log, NAME " %p %p %d", this, dst_datas[i], - n_samples * outport->stride); } + + spa_log_trace_fp(this->log, NAME " %p: n_src:%d n_dst:%d n_samples:%d max:%d p:%d", this, + n_src_datas, n_dst_datas, n_samples, maxsize, this->is_passthrough); + if (!this->is_passthrough) convert_process(&this->conv, dst_datas, src_datas, n_samples);