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

milan-avb: acmp: preserve talker entity_id across BIND_RX -> CONNECT_TX round-trip

Browse source
This commit is contained in:
hackerman-kl 2026-05-27 09:55:22 +00:00 • committed by Wim Taymans
parent ed951081b1
commit e9e5bb72a6
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,12 @@ static inline uint64_t peer_id_from_entity_id(uint64_t entity_id, uint16_t uniqu
return 0; return 0;
} }
/* Non-EUI-64 entity_id (MAC|entity_index): high 48 bits are the MAC, swap the
* low 16 for unique_id. EUI-64 (FF:FE marker) rebuilds the stream_id below. */
if (((entity_id >> 24) & 0xFFFFULL) != 0xFFFEULL) {
return (entity_id & 0xFFFFFFFFFFFF0000ULL) | unique_id;
}
return (entity_id & 0xFFFFFF0000000000ULL) | return (entity_id & 0xFFFFFF0000000000ULL) |
((entity_id & 0xFFFFFFULL) << 16) | ((entity_id & 0xFFFFFFULL) << 16) |
unique_id; unique_id;
@ -69,11 +75,17 @@ static inline void clear_stream_binding(struct aecp_aem_stream_input_state_milan
sizeof(stream->stream_in_sta.common.stream.addr)); sizeof(stream->stream_in_sta.common.stream.addr));
stream->stream_in_sta.common.stream.vlan_id = AVB_DEFAULT_VLAN; stream->stream_in_sta.common.stream.vlan_id = AVB_DEFAULT_VLAN;
stream->acmp_sta.talker_entity_id = 0;
stream->stream_in_sta.stream_info_dirty = true; stream->stream_in_sta.stream_info_dirty = true;
} }
static inline uint64_t stream_talker_entity_id(const struct aecp_aem_stream_input_state_milan_v12 *s) static inline uint64_t stream_talker_entity_id(const struct aecp_aem_stream_input_state_milan_v12 *s)
{ {
/* Prefer the talker entity_id stashed at BIND_RX (round-trip-safe); deriving it
* from the MSRP stream_id is lossy for non-EUI-64 entity_ids. */
if (s->acmp_sta.talker_entity_id != 0) {
return s->acmp_sta.talker_entity_id;
}
return entity_id_from_peer_id(be64toh(s->stream_in_sta.common.lstream_attr.attr.listener.stream_id)); return entity_id_from_peer_id(be64toh(s->stream_in_sta.common.lstream_attr.attr.listener.stream_id));
} }
@ -455,6 +467,7 @@ static void binding_save_parameters(struct acmp *acmp,
uint64_t stream_id = htobe64(peer_id_from_entity_id(be64toh(p->talker_guid), ntohs(p->talker_unique_id))); uint64_t stream_id = htobe64(peer_id_from_entity_id(be64toh(p->talker_guid), ntohs(p->talker_unique_id)));
stream->acmp_sta.controller_entity_id = be64toh(p->controller_guid); stream->acmp_sta.controller_entity_id = be64toh(p->controller_guid);
stream->acmp_sta.talker_entity_id = be64toh(p->talker_guid);
stream->stream_in_sta.common.lstream_attr.attr.listener.stream_id = stream_id; stream->stream_in_sta.common.lstream_attr.attr.listener.stream_id = stream_id;
stream->stream_in_sta.common.tastream_attr.attr.talker.stream_id = stream_id; stream->stream_in_sta.common.tastream_attr.attr.talker.stream_id = stream_id;
stream->stream_in_sta.common.tfstream_attr.attr.talker_fail.talker.stream_id = stream_id; stream->stream_in_sta.common.tfstream_attr.attr.talker_fail.talker.stream_id = stream_id;

5
src/modules/module-avb/aecp-aem-state.h
View file

@ -186,6 +186,11 @@ struct aecp_aem_stream_input_state {
struct acmp_stream_status_milan_v12 { struct acmp_stream_status_milan_v12 {
uint64_t controller_entity_id; uint64_t controller_entity_id;
/* Original talker entity_id captured at BIND_RX_COMMAND time, used
* verbatim when emitting CONNECT_TX_COMMAND probes. Needed because the
* stream_id ↔ entity_id round-trip via peer_id_from_entity_id() is
* lossy for non-EUI-64 entity_ids (e.g. MAC | entity_index). */
uint64_t talker_entity_id;
uint32_t acmp_flags; uint32_t acmp_flags;
uint8_t probing_status; uint8_t probing_status;
uint8_t acmp_status; uint8_t acmp_status;