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: msrp: gate listener Ready on talker registrar

Browse source
This commit is contained in:
hackerman-kl 2026-04-25 07:01:14 +02:00 • committed by Wim Taymans
parent 080d4b6f09
commit 2d476cab79
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/module-avb/msrp.c
View file

@ -13,6 +13,7 @@
#include "utils.h"
#include "msrp.h"
#include "acmp.h"
#include "stream.h"
static const uint8_t msrp_mac[6] = AVB_MSRP_MAC;
@ -52,8 +53,12 @@ static void debug_msrp_talker(const struct avb_packet_msrp_talker *t)
debug_msrp_talker_common(t);
}
/* IEEE 802.1Q Section 35.2.2.4.4: Listener may declare Ready only once the matching
* Talker Advertise is registered; otherwise it stays in AskingFailed. */
static void notify_talker(struct msrp *msrp, uint64_t now, struct attr *attr, uint8_t notify)
{
struct stream_common *sc;
pw_log_info("> notify talker advertise: %s", avb_mrp_notify_name(notify));
if (msrp->server->avb_mode == AVB_MODE_MILAN_V12) {
uint64_t stream_id = be64toh(attr->attr->attr.talker.stream_id);
@ -62,6 +67,14 @@ static void notify_talker(struct msrp *msrp, uint64_t now, struct attr *attr, ui
else if (notify == AVB_MRP_NOTIFY_LEAVE)
handle_evt_tk_departed(msrp->server->acmp, stream_id, now);
}
sc = SPA_CONTAINER_OF(attr->attr, struct stream_common, tastream_attr);
if (sc->stream.direction == SPA_DIRECTION_INPUT) {
if (notify == AVB_MRP_NOTIFY_NEW || notify == AVB_MRP_NOTIFY_JOIN)
sc->lstream_attr.param = AVB_MSRP_LISTENER_PARAM_READY;
else if (notify == AVB_MRP_NOTIFY_LEAVE)
sc->lstream_attr.param = AVB_MSRP_LISTENER_PARAM_ASKING_FAILED;
}
}
static void notify_talker_failed(struct msrp *msrp, uint64_t now, struct attr *attr, uint8_t notify)

4
src/modules/module-avb/stream.c
View file

@ -592,7 +592,9 @@ int stream_activate(struct stream *stream, uint16_t index, uint64_t now)
input_stream = SPA_CONTAINER_OF(common, struct aecp_aem_stream_input_state, common);
common->lstream_attr.attr.listener.stream_id = htobe64(stream->peer_id);
common->lstream_attr.param = AVB_MSRP_LISTENER_PARAM_READY;
/* Milan Section 4.3.3.1: Listener starts in AskingFailed; notify_talker
* promotes to Ready once the Talker Advertise registrar is IN. */
common->lstream_attr.param = AVB_MSRP_LISTENER_PARAM_ASKING_FAILED;
avb_mrp_attribute_begin(common->lstream_attr.mrp, now);
avb_mrp_attribute_join(common->lstream_attr.mrp, now, true);