mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-06-05 03:01:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

milan-avb: acmp: fixing the missing stream deactivate

Browse source
This commit is contained in:
hackerman-kl 2026-04-26 16:07:46 +02:00 • committed by Wim Taymans
parent de17f14da4
commit 16d793db38
2 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/modules/module-avb/acmp-cmds-resps/acmp-milan-v12.c
View file

@ -398,9 +398,15 @@ static void prepare_get_rx_response_success(struct acmp *acmp,
{ {
struct avb_ethernet_header *h_reply = (struct avb_ethernet_header *)outbuf; struct avb_ethernet_header *h_reply = (struct avb_ethernet_header *)outbuf;
struct avb_packet_acmp *reply = SPA_PTROFF(h_reply, sizeof(*h_reply), void); struct avb_packet_acmp *reply = SPA_PTROFF(h_reply, sizeof(*h_reply), void);
struct stream_common *sc = &stream->stream_in_sta.common;
struct avb_msrp_attribute *tfattr = &sc->tfstream_attr;
/* Milan v1.2 Section 5.5.3.5: bound iff the listener FSM is not in UNBOUND. */ /* Milan v1.2 Section 5.5.3.5: bound iff the listener FSM is not in UNBOUND. */
bool bound = (stream->acmp_sta.fsm_acmp_state != bool bound = (stream->acmp_sta.fsm_acmp_state !=
FSM_ACMP_STATE_MILAN_V12_UNBOUND); FSM_ACMP_STATE_MILAN_V12_UNBOUND);
bool streaming_wait = bound && !stream->stream_in_sta.started;
bool srp_failed = bound && tfattr->mrp != NULL &&
(avb_mrp_attribute_get_registrar_state(tfattr->mrp) == AVB_MRP_IN ||
avb_mrp_attribute_get_registrar_state(tfattr->mrp) == AVB_MRP_LV);
uint16_t flags; uint16_t flags;
memcpy(outbuf, m, len); memcpy(outbuf, m, len);
@ -415,12 +421,14 @@ static void prepare_get_rx_response_success(struct acmp *acmp,
reply->connection_count = htons(bound ? 1 : 0); reply->connection_count = htons(bound ? 1 : 0);
flags = ntohs(reply->flags); flags = ntohs(reply->flags);
if (bound) if (streaming_wait)
flags |= AVB_ACMP_FLAG_SRP_REGISTRATION_FAILED flags |= AVB_ACMP_FLAG_STREAMING_WAIT;
| AVB_ACMP_FLAG_STREAMING_WAIT;
else else
flags &= ~(AVB_ACMP_FLAG_SRP_REGISTRATION_FAILED flags &= ~AVB_ACMP_FLAG_STREAMING_WAIT;
| AVB_ACMP_FLAG_STREAMING_WAIT); if (srp_failed)
flags |= AVB_ACMP_FLAG_SRP_REGISTRATION_FAILED;
else
flags &= ~AVB_ACMP_FLAG_SRP_REGISTRATION_FAILED;
reply->flags = htons(flags); reply->flags = htons(flags);
} }
@ -1614,10 +1622,14 @@ int handle_fsm_settled_no_rsv_evt_tk_registered_evt(struct acmp *acmp,
size_t len, uint64_t now) size_t len, uint64_t now)
{ {
struct acmp_milan_v12 *acmp_m = (struct acmp_milan_v12 *)acmp; struct acmp_milan_v12 *acmp_m = (struct acmp_milan_v12 *)acmp;
struct stream *s = &stream->stream_in_sta.common.stream;
acmp_timer_lt_find_remove_milan_v12(acmp_m, stream, FSM_ACMP_EVT_MILAN_V12_TMR_NO_TK); acmp_timer_lt_find_remove_milan_v12(acmp_m, stream, FSM_ACMP_EVT_MILAN_V12_TMR_NO_TK);
stream->acmp_sta.fsm_acmp_state = FSM_ACMP_STATE_MILAN_V12_SETTLED_RSV_OK; stream->acmp_sta.fsm_acmp_state = FSM_ACMP_STATE_MILAN_V12_SETTLED_RSV_OK;
if (s->source == NULL)
stream_activate(s, s->index, now);
return 0; return 0;
} }
@ -1780,7 +1792,11 @@ int handle_fsm_settled_rsv_ok_evt_tk_departed_evt(struct acmp *acmp,
struct aecp_aem_stream_input_state_milan_v12 *stream, const void *m, struct aecp_aem_stream_input_state_milan_v12 *stream, const void *m,
size_t len, uint64_t now) size_t len, uint64_t now)
{ {
struct stream *s = &stream->stream_in_sta.common.stream;
pw_log_info("rx: tk_departed"); pw_log_info("rx: tk_departed");
if (s->source != NULL)
stream_deactivate(s, now);
return 0; return 0;
} }
@ -1790,8 +1806,12 @@ int handle_fsm_settled_rsv_ok_evt_tk_unregistered_evt(struct acmp *acmp,
size_t len, uint64_t now) size_t len, uint64_t now)
{ {
struct acmp_milan_v12 *acmp_m = (struct acmp_milan_v12 *)acmp; struct acmp_milan_v12 *acmp_m = (struct acmp_milan_v12 *)acmp;
struct stream *s = &stream->stream_in_sta.common.stream;
uint64_t talker_guid; uint64_t talker_guid;
if (s->source != NULL)
stream_deactivate(s, now);
talker_guid = stream_talker_entity_id(stream); talker_guid = stream_talker_entity_id(stream);
if (!adp_is_discovered_entity(acmp->server, talker_guid)) { if (!adp_is_discovered_entity(acmp->server, talker_guid)) {
stream->acmp_sta.probing_status = ACMP_MILAN_V12_PBSTA_PASSIVE; stream->acmp_sta.probing_status = ACMP_MILAN_V12_PBSTA_PASSIVE;

9
src/modules/module-avb/aecp-aem-cmds-resps/cmd-get-set-stream-format.c
View file

@ -146,6 +146,15 @@ int handle_cmd_set_stream_format_milan_v12(struct aecp *aecp, int64_t now,
} }
stream_desc->current_format = new_format; stream_desc->current_format = new_format;
if (desc_type == AVB_AEM_DESC_STREAM_INPUT) {
struct aecp_aem_stream_input_state *si = desc->ptr;
si->common.stream.format = new_format;
} else {
struct aecp_aem_stream_output_state *so = desc->ptr;
so->common.stream.format = new_format;
}
rc = reply_success(aecp, buf, len); rc = reply_success(aecp, buf, len);
if (rc < 0) if (rc < 0)
return rc; return rc;