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

milan-avb: use vlan and mac address from the stream itself

Browse source
This commit is contained in:
hackerman-kl 2026-03-15 10:21:03 +01:00 • committed by Wim Taymans
parent e9a51bd84f
commit 0309d598a1
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -956,6 +956,7 @@ int handle_fsm_prb_w_resp_rcv_probe_tx_resp_evt(struct acmp *acmp,
{ {
uint8_t buf[512]; uint8_t buf[512];
struct acmp_milan_v12 *acmp_m = (struct acmp_milan_v12 *)acmp; struct acmp_milan_v12 *acmp_m = (struct acmp_milan_v12 *)acmp;
struct stream *stream_generic = (struct stream *) stream;
struct server *server = acmp->server; struct server *server = acmp->server;
struct avb_ethernet_header *h = (struct avb_ethernet_header *)m; struct avb_ethernet_header *h = (struct avb_ethernet_header *)m;
struct avb_packet_acmp *p = SPA_PTROFF(m, sizeof(*h), void); struct avb_packet_acmp *p = SPA_PTROFF(m, sizeof(*h), void);
@ -997,9 +998,10 @@ int handle_fsm_prb_w_resp_rcv_probe_tx_resp_evt(struct acmp *acmp,
stream->acmp_status.common.saved_bindings.talker_unique_id = ntohs(p->talker_unique_id); stream->acmp_status.common.saved_bindings.talker_unique_id = ntohs(p->talker_unique_id);
stream->acmp_status.common.saved_bindings.talker_unique_id = ntohs(p->talker_unique_id); stream->acmp_status.common.saved_bindings.talker_unique_id = ntohs(p->talker_unique_id);
memcpy(stream->acmp_status.common.stream_dest_mac, p->stream_dest_mac, memcpy(stream_generic->addr, p->stream_dest_mac,
sizeof(p->stream_dest_mac)); sizeof(p->stream_dest_mac));
stream->acmp_status.common.stream_vlanid = ntohs(p->stream_vlan_id); stream_generic->vlan_id = ntohs(p->stream_vlan_id);
stream->acmp_status.common.probing_status = ACMP_MILAN_V12_PBSTA_COMPLETED; stream->acmp_status.common.probing_status = ACMP_MILAN_V12_PBSTA_COMPLETED;

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

@ -154,8 +154,6 @@ struct acmp_stream_status_common {
struct stream_input_saved_binding_param saved_bindings; struct stream_input_saved_binding_param saved_bindings;
uint8_t probing_status; uint8_t probing_status;
uint8_t acmp_status; uint8_t acmp_status;
uint8_t stream_dest_mac[6];
uint16_t stream_vlanid;
}; };
struct acmp_stream_status_milan_v12 { struct acmp_stream_status_milan_v12 {

5
src/modules/module-avb/stream.h
View file

@ -25,15 +25,16 @@ struct stream {
uint16_t direction; uint16_t direction;
uint64_t id; uint64_t id;
uint64_t peer_id;
struct pw_stream *stream; struct pw_stream *stream;
struct spa_hook stream_listener; struct spa_hook stream_listener;
uint64_t peer_id;
uint8_t addr[6]; uint8_t addr[6];
int vlan_id;
struct spa_source *source; struct spa_source *source;
int prio; int prio;
int vlan_id;
int mtt; int mtt;
int t_uncertainty; int t_uncertainty;
uint32_t frames_per_pdu; uint32_t frames_per_pdu;