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 bbf8f1a0c8.

This causes all kinds of things to go wrong, mostly failure to
renegotiate buffers. Needs more testing.
This commit is contained in:
Wim Taymans 2023-06-21 15:58:41 +02:00
parent d24c8da5d2
commit c4c6a3fd1b
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)
{
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:
if (param == NULL) {
graph_cleanup(graph);
param_format_cleared(impl, impl->capture, &impl->capture_info);
param_format_cleared(impl, impl->playback, &impl->playback_info);
} else {
struct spa_audio_info_raw 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;
}
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,
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:
{
struct spa_audio_info_raw info;
if (param == NULL) {
param_format_cleared(impl, impl->playback, &impl->playback_info);
if (param == NULL)
return;
}
if (spa_format_audio_raw_parse(param, &info) < 0)
return;
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;
switch (id) {
case SPA_PARAM_Format:
if (param == NULL) {
param_format_cleared(impl, impl->capture, &impl->capture_info);
return;
}
break;
case SPA_PARAM_Latency:
param_latency_changed(impl, param, &impl->playback_latency, impl->capture);
break;