mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "module-loopback: request renegotiation when suspended"

Browse source 
This reverts commit 2c5a3e9593.

Causes problems when switching devices because it doesn't renegotiate
properly.
This commit is contained in:
Wim Taymans 2023-06-22 10:08:58 +02:00
parent 774af1487a
commit 3db3e6dacf
2 changed files with 1 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/module-filter-chain.c
View file

@ -1124,18 +1124,6 @@ static void state_changed(void *data, enum pw_stream_state old,
} }
} }
static void param_format_cleared(struct impl *impl, struct pw_stream *other,
struct spa_audio_info_raw *other_info)
{
uint8_t buffer[1024];
struct spa_pod_builder b;
const struct spa_pod *params[1];
spa_pod_builder_init(&b, buffer, sizeof(buffer));
params[0] = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat, other_info);
pw_stream_update_params(other, params, 1);
}
static void param_changed(void *data, uint32_t id, const struct spa_pod *param) static void param_changed(void *data, uint32_t id, const struct spa_pod *param)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -1146,8 +1134,6 @@ static void param_changed(void *data, uint32_t id, const struct spa_pod *param)
case SPA_PARAM_Format: case SPA_PARAM_Format:
if (param == NULL) { if (param == NULL) {
graph_cleanup(graph); graph_cleanup(graph);
param_format_cleared(impl, impl->capture, &impl->capture_info);
param_format_cleared(impl, impl->playback, &impl->playback_info);
} else { } else {
struct spa_audio_info_raw info; struct spa_audio_info_raw info;
spa_zero(info); spa_zero(info);

22
src/modules/module-loopback.c
View file

@ -332,18 +332,6 @@ static void param_latency_changed(struct impl *impl, const struct spa_pod *param
impl->recalc_delay = true; impl->recalc_delay = true;
} }
static void param_format_cleared(struct impl *impl, struct pw_stream *other,
struct spa_audio_info_raw *other_info)
{
uint8_t buffer[1024];
struct spa_pod_builder b;
const struct spa_pod *params[1];
spa_pod_builder_init(&b, buffer, sizeof(buffer));
params[0] = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat, other_info);
pw_stream_update_params(other, params, 1);
}
static void stream_state_changed(void *data, enum pw_stream_state old, static void stream_state_changed(void *data, enum pw_stream_state old,
enum pw_stream_state state, const char *error) enum pw_stream_state state, const char *error)
{ {
@ -398,10 +386,8 @@ static void capture_param_changed(void *data, uint32_t id, const struct spa_pod
case SPA_PARAM_Format: case SPA_PARAM_Format:
{ {
struct spa_audio_info_raw info; struct spa_audio_info_raw info;
if (param == NULL) { if (param == NULL)
param_format_cleared(impl, impl->playback, &impl->playback_info);
return; return;
}
if (spa_format_audio_raw_parse(param, &info) < 0) if (spa_format_audio_raw_parse(param, &info) < 0)
return; return;
if (info.rate == 0 || if (info.rate == 0 ||
@ -439,12 +425,6 @@ static void playback_param_changed(void *data, uint32_t id, const struct spa_pod
struct impl *impl = data; struct impl *impl = data;
switch (id) { switch (id) {
case SPA_PARAM_Format:
if (param == NULL) {
param_format_cleared(impl, impl->capture, &impl->capture_info);
return;
}
break;
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
param_latency_changed(impl, param, &impl->playback_latency, impl->capture); param_latency_changed(impl, param, &impl->playback_latency, impl->capture);
break; break;