From cf361efe9a3860787b7742711263ab747845e05e Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 13 Jan 2025 11:49:57 +0800 Subject: [PATCH 1/3] add log Signed-off-by: Charles --- src/pulsecore/protocol-native.c | 14 ++++++++++++++ src/pulsecore/sink-input.c | 10 ++++++++++ src/pulsecore/source-output.c | 10 ++++++++++ 3 files changed, 34 insertions(+) diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 21e58603c..7721d7f68 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -624,6 +624,13 @@ static record_stream* record_stream_new( (double) s->configured_source_latency / PA_USEC_PER_MSEC); pa_source_output_put(s->source_output); + + if (s->source_output->source) { + AUDIO_INFO_LOG("[NEW]: SourceOutput[%{public}u] -----> source[%{public}u, %{public}s].", + s->source_output->index, s->source_output->source->index, s->source_output->source->name); + } else { + AUDIO_ERR_LOG("SourceOutput[%{public}u] -----> source is nullptr", s->source_output->index); + } return s; } @@ -1134,6 +1141,13 @@ static playback_stream* playback_stream_new( pa_sink_input_put(s->sink_input); + if (s->sink_input->sink) { + AUDIO_INFO_LOG("[NEW]: SinkInput[%{public}u] -----> sink[%{public}u, %{public}s].", + s->sink_input->index, s->sink_input->sink->index, s->sink_input->sink->name); + } else { + AUDIO_ERR_LOG("SourceInput[%{public}u] -----> sink is nullptr", s->sink_input->index); + } + out: if (formats) pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free); diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index c1cd281bd..ed729c2a1 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -1882,6 +1882,10 @@ int pa_sink_input_start_move(pa_sink_input *i) { return r; pa_log_debug("Starting to move sink input %u from '%s'", (unsigned) i->index, i->sink->name); + if (i->sink) { + AUDIO_INFO_LOG("[StartMove]: SinkInput[%{public}u] --xxxx--> sink[%{public}u, %{public}s]", + i->index, i->sink->index, i->sink->name); + } /* Kill directly connected outputs */ while ((o = pa_idxset_first(i->direct_outputs, NULL))) { @@ -2190,6 +2194,11 @@ int pa_sink_input_finish_move(pa_sink_input *i, pa_sink *dest, bool save) { i->moving(i, dest); i->sink = dest; + if (dest) { + AUDIO_INFO_LOG("[FinishMove]: SinkInput[%{public}u] ----------> sink[%{public}u, %{public}s]", + i->index, dest->index, dest->name); + } + /* save == true, means user is calling the move_to() and want to save the preferred_sink */ if (save) { @@ -2252,6 +2261,7 @@ void pa_sink_input_fail_move(pa_sink_input *i) { return; } + AUDIO_WARNING_LOG("[FailMove]: SinkInput[%{public}u] moving FAILED.", i->index); if (i->moving) i->moving(i, NULL); diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index 7c6cb78a3..510b4a28a 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -1393,6 +1393,10 @@ int pa_source_output_start_move(pa_source_output *o) { return r; pa_log_debug("Starting to move source output %u from '%s'", (unsigned) o->index, o->source->name); + if (o->source) { + AUDIO_INFO_LOG("[StartMove]: SourceOutput[%{public}u] --xxxx--> source[%{public}u, %{public}s]", + o->index, o->source->index, o->source->name); + } origin = o->source; @@ -1613,6 +1617,11 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, bool save o->moving(o, dest); o->source = dest; + if (dest) { + AUDIO_INFO_LOG("[FinishMove]: SourceOutput[%{public}u] ----------> source[%{public}u, %{public}s]", + o->index, dest->index, dest->name); + } + /* save == true, means user is calling the move_to() and want to save the preferred_source */ if (save) { @@ -1667,6 +1676,7 @@ void pa_source_output_fail_move(pa_source_output *o) { return; } + AUDIO_WARNING_LOG("[FailMove]: SourceOutput[%{public}u] moving FAILED.", o->index); if (o->moving) o->moving(o, NULL); -- Gitee From 52e7a9e42edb24f1ae54fde9ba4782639f7e3928 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 13 Jan 2025 11:49:57 +0800 Subject: [PATCH 2/3] add log Signed-off-by: Charles --- src/pulsecore/protocol-native.c | 14 ++++++++++++++ src/pulsecore/sink-input.c | 12 ++++++++++++ src/pulsecore/source-output.c | 12 ++++++++++++ 3 files changed, 38 insertions(+) diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 21e58603c..7721d7f68 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -624,6 +624,13 @@ static record_stream* record_stream_new( (double) s->configured_source_latency / PA_USEC_PER_MSEC); pa_source_output_put(s->source_output); + + if (s->source_output->source) { + AUDIO_INFO_LOG("[NEW]: SourceOutput[%{public}u] -----> source[%{public}u, %{public}s].", + s->source_output->index, s->source_output->source->index, s->source_output->source->name); + } else { + AUDIO_ERR_LOG("SourceOutput[%{public}u] -----> source is nullptr", s->source_output->index); + } return s; } @@ -1134,6 +1141,13 @@ static playback_stream* playback_stream_new( pa_sink_input_put(s->sink_input); + if (s->sink_input->sink) { + AUDIO_INFO_LOG("[NEW]: SinkInput[%{public}u] -----> sink[%{public}u, %{public}s].", + s->sink_input->index, s->sink_input->sink->index, s->sink_input->sink->name); + } else { + AUDIO_ERR_LOG("SourceInput[%{public}u] -----> sink is nullptr", s->sink_input->index); + } + out: if (formats) pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free); diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index c1cd281bd..ae3ab21c7 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -40,6 +40,8 @@ #include #include +#include "log/audio_log.h" + #include "sink-input.h" /* #define SINK_INPUT_DEBUG */ @@ -1882,6 +1884,10 @@ int pa_sink_input_start_move(pa_sink_input *i) { return r; pa_log_debug("Starting to move sink input %u from '%s'", (unsigned) i->index, i->sink->name); + if (i->sink) { + AUDIO_INFO_LOG("[StartMove]: SinkInput[%{public}u] --xxxx--> sink[%{public}u, %{public}s]", + i->index, i->sink->index, i->sink->name); + } /* Kill directly connected outputs */ while ((o = pa_idxset_first(i->direct_outputs, NULL))) { @@ -2190,6 +2196,11 @@ int pa_sink_input_finish_move(pa_sink_input *i, pa_sink *dest, bool save) { i->moving(i, dest); i->sink = dest; + if (dest) { + AUDIO_INFO_LOG("[FinishMove]: SinkInput[%{public}u] ----------> sink[%{public}u, %{public}s]", + i->index, dest->index, dest->name); + } + /* save == true, means user is calling the move_to() and want to save the preferred_sink */ if (save) { @@ -2252,6 +2263,7 @@ void pa_sink_input_fail_move(pa_sink_input *i) { return; } + AUDIO_WARNING_LOG("[FailMove]: SinkInput[%{public}u] moving FAILED.", i->index); if (i->moving) i->moving(i, NULL); diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index 7c6cb78a3..9d9e2937b 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -39,6 +39,8 @@ #include #include +#include "log/audio_log.h" + #include "source-output.h" #define MEMBLOCKQ_MAXLENGTH (32*1024*1024) @@ -1393,6 +1395,10 @@ int pa_source_output_start_move(pa_source_output *o) { return r; pa_log_debug("Starting to move source output %u from '%s'", (unsigned) o->index, o->source->name); + if (o->source) { + AUDIO_INFO_LOG("[StartMove]: SourceOutput[%{public}u] --xxxx--> source[%{public}u, %{public}s]", + o->index, o->source->index, o->source->name); + } origin = o->source; @@ -1613,6 +1619,11 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, bool save o->moving(o, dest); o->source = dest; + if (dest) { + AUDIO_INFO_LOG("[FinishMove]: SourceOutput[%{public}u] ----------> source[%{public}u, %{public}s]", + o->index, dest->index, dest->name); + } + /* save == true, means user is calling the move_to() and want to save the preferred_source */ if (save) { @@ -1667,6 +1678,7 @@ void pa_source_output_fail_move(pa_source_output *o) { return; } + AUDIO_WARNING_LOG("[FailMove]: SourceOutput[%{public}u] moving FAILED.", o->index); if (o->moving) o->moving(o, NULL); -- Gitee From 4f45239c801393d418339974dc8bd994fff0a248 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 13 Jan 2025 14:12:47 +0800 Subject: [PATCH 3/3] add log Signed-off-by: Charles --- src/pulsecore/protocol-native.c | 14 ++++++++++++++ src/pulsecore/sink-input.c | 12 ++++++++++++ src/pulsecore/source-output.c | 12 ++++++++++++ 3 files changed, 38 insertions(+) diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 21e58603c..7721d7f68 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -624,6 +624,13 @@ static record_stream* record_stream_new( (double) s->configured_source_latency / PA_USEC_PER_MSEC); pa_source_output_put(s->source_output); + + if (s->source_output->source) { + AUDIO_INFO_LOG("[NEW]: SourceOutput[%{public}u] -----> source[%{public}u, %{public}s].", + s->source_output->index, s->source_output->source->index, s->source_output->source->name); + } else { + AUDIO_ERR_LOG("SourceOutput[%{public}u] -----> source is nullptr", s->source_output->index); + } return s; } @@ -1134,6 +1141,13 @@ static playback_stream* playback_stream_new( pa_sink_input_put(s->sink_input); + if (s->sink_input->sink) { + AUDIO_INFO_LOG("[NEW]: SinkInput[%{public}u] -----> sink[%{public}u, %{public}s].", + s->sink_input->index, s->sink_input->sink->index, s->sink_input->sink->name); + } else { + AUDIO_ERR_LOG("SourceInput[%{public}u] -----> sink is nullptr", s->sink_input->index); + } + out: if (formats) pa_idxset_free(formats, (pa_free_cb_t) pa_format_info_free); diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index c1cd281bd..ae3ab21c7 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -40,6 +40,8 @@ #include #include +#include "log/audio_log.h" + #include "sink-input.h" /* #define SINK_INPUT_DEBUG */ @@ -1882,6 +1884,10 @@ int pa_sink_input_start_move(pa_sink_input *i) { return r; pa_log_debug("Starting to move sink input %u from '%s'", (unsigned) i->index, i->sink->name); + if (i->sink) { + AUDIO_INFO_LOG("[StartMove]: SinkInput[%{public}u] --xxxx--> sink[%{public}u, %{public}s]", + i->index, i->sink->index, i->sink->name); + } /* Kill directly connected outputs */ while ((o = pa_idxset_first(i->direct_outputs, NULL))) { @@ -2190,6 +2196,11 @@ int pa_sink_input_finish_move(pa_sink_input *i, pa_sink *dest, bool save) { i->moving(i, dest); i->sink = dest; + if (dest) { + AUDIO_INFO_LOG("[FinishMove]: SinkInput[%{public}u] ----------> sink[%{public}u, %{public}s]", + i->index, dest->index, dest->name); + } + /* save == true, means user is calling the move_to() and want to save the preferred_sink */ if (save) { @@ -2252,6 +2263,7 @@ void pa_sink_input_fail_move(pa_sink_input *i) { return; } + AUDIO_WARNING_LOG("[FailMove]: SinkInput[%{public}u] moving FAILED.", i->index); if (i->moving) i->moving(i, NULL); diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index 7c6cb78a3..9d9e2937b 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -39,6 +39,8 @@ #include #include +#include "log/audio_log.h" + #include "source-output.h" #define MEMBLOCKQ_MAXLENGTH (32*1024*1024) @@ -1393,6 +1395,10 @@ int pa_source_output_start_move(pa_source_output *o) { return r; pa_log_debug("Starting to move source output %u from '%s'", (unsigned) o->index, o->source->name); + if (o->source) { + AUDIO_INFO_LOG("[StartMove]: SourceOutput[%{public}u] --xxxx--> source[%{public}u, %{public}s]", + o->index, o->source->index, o->source->name); + } origin = o->source; @@ -1613,6 +1619,11 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, bool save o->moving(o, dest); o->source = dest; + if (dest) { + AUDIO_INFO_LOG("[FinishMove]: SourceOutput[%{public}u] ----------> source[%{public}u, %{public}s]", + o->index, dest->index, dest->name); + } + /* save == true, means user is calling the move_to() and want to save the preferred_source */ if (save) { @@ -1667,6 +1678,7 @@ void pa_source_output_fail_move(pa_source_output *o) { return; } + AUDIO_WARNING_LOG("[FailMove]: SourceOutput[%{public}u] moving FAILED.", o->index); if (o->moving) o->moving(o, NULL); -- Gitee