avb: remove libavtp dependency

This commit is contained in:
Wim Taymans 2022-03-14 13:00:09 +01:00
parent c79fddf007
commit af4875eb47
7 changed files with 270 additions and 75 deletions

View file

@ -77,9 +77,6 @@ if get_option('spa-plugins').allowed()
libudev_dep = dependency('libudev', required: alsa_dep.found() or get_option('udev').enabled() or get_option('v4l2').enabled())
summary({'Udev': libudev_dep.found()}, bool_yn: true, section: 'Backend')
libavtp_dep = dependency('avtp', required: get_option('avb'))
summary({'libavtp': libavtp_dep.found()}, bool_yn: true, section: 'Backend')
subdir('plugins')
endif

View file

@ -24,9 +24,6 @@
#include <stddef.h>
#include <avtp.h>
#include <avtp_aaf.h>
#include <spa/node/node.h>
#include <spa/node/utils.h>
#include <spa/node/keys.h>

View file

@ -24,9 +24,6 @@
#include <stddef.h>
#include <avtp.h>
#include <avtp_aaf.h>
#include <spa/node/node.h>
#include <spa/node/utils.h>
#include <spa/node/keys.h>

View file

@ -431,11 +431,11 @@ int spa_avb_clear(struct state *state)
static int spa_format_to_aaf(uint32_t format)
{
switch(format) {
case SPA_AUDIO_FORMAT_F32_BE: return AVTP_AAF_FORMAT_FLOAT_32BIT;
case SPA_AUDIO_FORMAT_S32_BE: return AVTP_AAF_FORMAT_INT_32BIT;
case SPA_AUDIO_FORMAT_S24_BE: return AVTP_AAF_FORMAT_INT_24BIT;
case SPA_AUDIO_FORMAT_S16_BE: return AVTP_AAF_FORMAT_INT_16BIT;
default: return AVTP_AAF_FORMAT_USER;
case SPA_AUDIO_FORMAT_F32_BE: return SPA_AVBTP_AAF_FORMAT_FLOAT_32BIT;
case SPA_AUDIO_FORMAT_S32_BE: return SPA_AVBTP_AAF_FORMAT_INT_32BIT;
case SPA_AUDIO_FORMAT_S24_BE: return SPA_AVBTP_AAF_FORMAT_INT_24BIT;
case SPA_AUDIO_FORMAT_S16_BE: return SPA_AVBTP_AAF_FORMAT_INT_16BIT;
default: return SPA_AVBTP_AAF_FORMAT_USER;
}
}
@ -453,17 +453,17 @@ static int frame_size(uint32_t format)
static int spa_rate_to_aaf(uint32_t rate)
{
switch(rate) {
case 8000: return AVTP_AAF_PCM_NSR_8KHZ;
case 16000: return AVTP_AAF_PCM_NSR_16KHZ;
case 24000: return AVTP_AAF_PCM_NSR_24KHZ;
case 32000: return AVTP_AAF_PCM_NSR_32KHZ;
case 44100: return AVTP_AAF_PCM_NSR_44_1KHZ;
case 48000: return AVTP_AAF_PCM_NSR_48KHZ;
case 88200: return AVTP_AAF_PCM_NSR_88_2KHZ;
case 96000: return AVTP_AAF_PCM_NSR_96KHZ;
case 176400: return AVTP_AAF_PCM_NSR_176_4KHZ;
case 192000: return AVTP_AAF_PCM_NSR_192KHZ;
default: return AVTP_AAF_PCM_NSR_USER;
case 8000: return SPA_AVBTP_AAF_PCM_NSR_8KHZ;
case 16000: return SPA_AVBTP_AAF_PCM_NSR_16KHZ;
case 24000: return SPA_AVBTP_AAF_PCM_NSR_24KHZ;
case 32000: return SPA_AVBTP_AAF_PCM_NSR_32KHZ;
case 44100: return SPA_AVBTP_AAF_PCM_NSR_44_1KHZ;
case 48000: return SPA_AVBTP_AAF_PCM_NSR_48KHZ;
case 88200: return SPA_AVBTP_AAF_PCM_NSR_88_2KHZ;
case 96000: return SPA_AVBTP_AAF_PCM_NSR_96KHZ;
case 176400: return SPA_AVBTP_AAF_PCM_NSR_176_4KHZ;
case 192000: return SPA_AVBTP_AAF_PCM_NSR_192KHZ;
default: return SPA_AVBTP_AAF_PCM_NSR_USER;
}
}
@ -628,8 +628,7 @@ error_close:
static int setup_packet(struct state *state, struct spa_audio_info *fmt)
{
int res;
struct avtp_stream_pdu *pdu;
struct spa_avbtp_packet_aaf *pdu;
struct props *p = &state->props;
ssize_t payload_size, hdr_size, pdu_size;
@ -639,39 +638,33 @@ static int setup_packet(struct state *state, struct spa_audio_info *fmt)
if ((pdu = calloc(1, pdu_size)) == NULL)
return -errno;
SPA_AVBTP_PACKET_AAF_SET_SUBTYPE(pdu, SPA_AVBTP_SUBTYPE_AAF);
if (state->ports[0].direction == SPA_DIRECTION_INPUT) {
if ((res = avtp_aaf_pdu_init(pdu)) < 0)
goto error;
#define PDU_SET(f,v) if ((res = avtp_aaf_pdu_set(pdu, (f), (v))) < 0) goto error;
PDU_SET(AVTP_AAF_FIELD_TV, 1);
PDU_SET(AVTP_AAF_FIELD_STREAM_ID, p->streamid);
PDU_SET(AVTP_AAF_FIELD_FORMAT, spa_format_to_aaf(state->format));
PDU_SET(AVTP_AAF_FIELD_NSR, spa_rate_to_aaf(state->rate));
PDU_SET(AVTP_AAF_FIELD_CHAN_PER_FRAME, state->channels);
PDU_SET(AVTP_AAF_FIELD_BIT_DEPTH, frame_size(state->format)*8);
PDU_SET(AVTP_AAF_FIELD_STREAM_DATA_LEN, payload_size);
PDU_SET(AVTP_AAF_FIELD_SP, AVTP_AAF_PCM_SP_NORMAL);
#undef PDU_SET
SPA_AVBTP_PACKET_AAF_SET_SV(pdu, 1);
SPA_AVBTP_PACKET_AAF_SET_STREAM_ID(pdu, p->streamid);
SPA_AVBTP_PACKET_AAF_SET_TV(pdu, 1);
SPA_AVBTP_PACKET_AAF_SET_FORMAT(pdu, spa_format_to_aaf(state->format));
SPA_AVBTP_PACKET_AAF_SET_NSR(pdu, spa_rate_to_aaf(state->rate));
SPA_AVBTP_PACKET_AAF_SET_CHAN_PER_FRAME(pdu, state->channels);
SPA_AVBTP_PACKET_AAF_SET_BIT_DEPTH(pdu, frame_size(state->format)*8);
SPA_AVBTP_PACKET_AAF_SET_DATA_LEN(pdu, payload_size);
SPA_AVBTP_PACKET_AAF_SET_SP(pdu, SPA_AVBTP_AAF_PCM_SP_NORMAL);
}
state->pdu = pdu;
state->hdr_size = hdr_size;
state->payload_size = payload_size;
state->pdu_size = pdu_size;
return 0;
error:
free(pdu);
return res;
}
static int setup_msg(struct state *state)
{
state->iov[0].iov_base = state->pdu;
state->iov[0].iov_len = state->hdr_size;
state->iov[1].iov_base = state->pdu->avtp_payload;
state->iov[1].iov_base = state->pdu->payload;
state->iov[1].iov_len = state->payload_size;
state->iov[2].iov_base = state->pdu->avtp_payload;
state->iov[2].iov_base = state->pdu->payload;
state->iov[2].iov_len = 0;
state->msg.msg_name = &state->sock_addr;
state->msg.msg_namelen = sizeof(state->sock_addr);
@ -761,17 +754,16 @@ static void reset_buffers(struct state *this, struct port *port)
}
}
static bool is_pdu_valid(struct state *state)
static inline bool is_pdu_valid(struct state *state)
{
uint64_t val64;
if (avtp_aaf_pdu_get(state->pdu, AVTP_AAF_FIELD_SEQ_NUM, &val64) < 0)
return false;
uint8_t seq_num;
if (state->prev_seq != 0 && (uint8_t)(state->prev_seq + 1) != val64) {
spa_log_warn(state->log, "dropped packets %d != %d", state->prev_seq + 1, (int)val64);
seq_num = SPA_AVBTP_PACKET_AAF_GET_SEQ_NUM(state->pdu);
if (state->prev_seq != 0 && (uint8_t)(state->prev_seq + 1) != seq_num) {
spa_log_warn(state->log, "dropped packets %d != %d", state->prev_seq + 1, seq_num);
}
state->prev_seq = val64;
state->prev_seq = seq_num;
return true;
}
@ -787,19 +779,17 @@ set_iovec(struct spa_ringbuffer *rbuf, void *buffer, uint32_t size,
static void avb_on_socket_event(struct spa_source *source)
{
int res;
struct state *state = source->data;
ssize_t n;
int32_t filled;
uint32_t subtype, index;
struct avtp_common_pdu *common;
struct avtp_stream_pdu *pdu = state->pdu;
struct spa_avbtp_packet_aaf *pdu = state->pdu;
bool overrun = false;
filled = spa_ringbuffer_get_write_index(&state->ring, &index);
overrun = filled > (int32_t) state->ringbuffer_size;
if (overrun) {
state->iov[1].iov_base = state->pdu->avtp_payload;
state->iov[1].iov_base = state->pdu->payload;
state->iov[1].iov_len = state->payload_size;
state->iov[2].iov_len = 0;
} else {
@ -816,16 +806,13 @@ static void avb_on_socket_event(struct spa_source *source)
return;
}
if (n != (ssize_t)state->pdu_size) {
spa_log_error(state->log, "AVTPDU dropped: Invalid size");
spa_log_error(state->log, "AVB packet dropped: Invalid size");
return;
}
common = (struct avtp_common_pdu *) pdu;
if ((res = avtp_pdu_get(common, AVTP_FIELD_SUBTYPE, &subtype)) < 0)
return;
if (subtype != AVTP_SUBTYPE_AAF) {
spa_log_error(state->log, "non supported subtype");
subtype = SPA_AVBTP_PACKET_AAF_GET_SUBTYPE(pdu);
if (subtype != SPA_AVBTP_SUBTYPE_AAF) {
spa_log_error(state->log, "non supported subtype %d", subtype);
return;
}
if (!is_pdu_valid(state)) {
@ -858,13 +845,12 @@ static void set_timeout(struct state *state, uint64_t next_time)
static int flush_write(struct state *state, uint64_t current_time)
{
int res;
int32_t avail, wanted;
uint32_t index;
uint64_t ptime, txtime;
int pdu_count;
struct props *p = &state->props;
struct avtp_stream_pdu *pdu = state->pdu;
struct spa_avbtp_packet_aaf *pdu = state->pdu;
ssize_t n;
avail = spa_ringbuffer_get_read_index(&state->ring, &index);
@ -888,10 +874,9 @@ static int flush_write(struct state *state, uint64_t current_time)
index % state->ringbuffer_size,
&state->iov[1], state->payload_size);
#define PDU_SET(f,v) if ((res = avtp_aaf_pdu_set(pdu, (f), (v))) < 0) return res;
PDU_SET(AVTP_AAF_FIELD_SEQ_NUM, state->pdu_seq++);
PDU_SET(AVTP_AAF_FIELD_TIMESTAMP, ptime);
#undef PDU_SET
SPA_AVBTP_PACKET_AAF_SET_SEQ_NUM(pdu, state->pdu_seq++);
SPA_AVBTP_PACKET_AAF_SET_TIMESTAMP(pdu, ptime);
n = sendmsg(state->sockfd, &state->msg, 0);
if (n < 0 || n != (ssize_t)state->pdu_size) {
spa_log_error(state->log, "sendmdg() failed: %m");

View file

@ -37,8 +37,7 @@ extern "C" {
#include <limits.h>
#include <net/if.h>
#include <avtp.h>
#include <avtp_aaf.h>
#include <avbtp/packets.h>
#include <spa/support/plugin.h>
#include <spa/support/loop.h>
@ -236,7 +235,7 @@ struct state {
struct spa_source sock_source;
struct sockaddr_ll sock_addr;
struct avtp_stream_pdu *pdu;
struct spa_avbtp_packet_aaf *pdu;
size_t hdr_size;
size_t payload_size;
size_t pdu_size;

View file

@ -0,0 +1,220 @@
/* Spa AVB support
*
* Copyright © 2022 Wim Taymans
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#ifndef SPA_AVB_PACKETS_H
#define SPA_AVB_PACKETS_H
#define SPA_AVBTP_SUBTYPE_61883_IIDC 0x00
#define SPA_AVBTP_SUBTYPE_MMA_STREAM 0x01
#define SPA_AVBTP_SUBTYPE_AAF 0x02
#define SPA_AVBTP_SUBTYPE_CVF 0x03
#define SPA_AVBTP_SUBTYPE_CRF 0x04
#define SPA_AVBTP_SUBTYPE_TSCF 0x05
#define SPA_AVBTP_SUBTYPE_SVF 0x06
#define SPA_AVBTP_SUBTYPE_RVF 0x07
#define SPA_AVBTP_SUBTYPE_AEF_CONTINUOUS 0x6E
#define SPA_AVBTP_SUBTYPE_VSF_STREAM 0x6F
#define SPA_AVBTP_SUBTYPE_EF_STREAM 0x7F
#define SPA_AVBTP_SUBTYPE_NTSCF 0x82
#define SPA_AVBTP_SUBTYPE_ESCF 0xEC
#define SPA_AVBTP_SUBTYPE_EECF 0xED
#define SPA_AVBTP_SUBTYPE_AEF_DISCRETE 0xEE
#define SPA_AVBTP_SUBTYPE_ADP 0xFA
#define SPA_AVBTP_SUBTYPE_AECP 0xFB
#define SPA_AVBTP_SUBTYPE_ACMP 0xFC
#define SPA_AVBTP_SUBTYPE_MAAP 0xFE
#define SPA_AVBTP_SUBTYPE_EF_CONTROL 0xFF
struct spa_avbtp_packet_common {
uint8_t subtype;
#if __BYTE_ORDER == __BIG_ENDIAN
unsigned sv:1; /* stream_id valid */
unsigned version:3;
unsigned subtype_data1:4;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
unsigned subtype_data1:4;
unsigned version:3;
unsigned sv:1;
#elif
#error "Unknown byte order"
#endif
uint16_t subtype_data2;
uint64_t stream_id;
uint8_t payload[0];
} __attribute__ ((__packed__));
#define SPA_AVBTP_PACKET_SET_SUBTYPE(p,v) ((p)->subtype = (v))
#define SPA_AVBTP_PACKET_SET_SV(p,v) ((p)->sv = (v))
#define SPA_AVBTP_PACKET_SET_VERSION(p,v) ((p)->version = (v))
#define SPA_AVBTP_PACKET_SET_STREAM_ID(p,v) ((p)->stream_id = htobe64(v))
#define SPA_AVBTP_PACKET_GET_SUBTYPE(p) ((p)->subtype)
#define SPA_AVBTP_PACKET_GET_SV(p) ((p)->sv)
#define SPA_AVBTP_PACKET_GET_VERSION(p) ((p)->version)
#define SPA_AVBTP_PACKET_GET_STREAM_ID(p) be64toh((p)->stream_id)
struct spa_avbtp_packet_cc {
uint8_t subtype;
#if __BYTE_ORDER == __BIG_ENDIAN
unsigned sv:1;
unsigned version:3;
unsigned control_data1:4;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
unsigned control_data1:4;
unsigned version:3;
unsigned sv:1;
#endif
uint8_t status;
uint16_t control_frame_length;
uint64_t stream_id;
uint8_t payload[0];
} __attribute__ ((__packed__));
#define SPA_AVBTP_PACKET_CC_SET_SUBTYPE(p,v) ((p)->subtype = (v))
#define SPA_AVBTP_PACKET_CC_SET_SV(p,v) ((p)->sv = (v))
#define SPA_AVBTP_PACKET_CC_SET_VERSION(p,v) ((p)->version = (v))
#define SPA_AVBTP_PACKET_CC_SET_STREAM_ID(p,v) ((p)->stream_id = htobe64(v))
#define SPA_AVBTP_PACKET_CC_SET_STATUS(p,v) ((p)->status = (v))
#define SPA_AVBTP_PACKET_CC_SET_LENGTH(p,v) ((p)->control_frame_length = htons(v))
#define SPA_AVBTP_PACKET_CC_GET_SUBTYPE(p) ((p)->subtype)
#define SPA_AVBTP_PACKET_CC_GET_SV(p) ((p)->sv)
#define SPA_AVBTP_PACKET_CC_GET_VERSION(p) ((p)->version)
#define SPA_AVBTP_PACKET_CC_GET_STREAM_ID(p) be64toh((p)->stream_id)
#define SPA_AVBTP_PACKET_CC_GET_STATUS(p) ((p)->status)
#define SPA_AVBTP_PACKET_CC_GET_LENGTH(p) ntohs((p)->control_frame_length)
/* AAF */
struct spa_avbtp_packet_aaf {
uint8_t subtype;
#if __BYTE_ORDER == __BIG_ENDIAN
unsigned sv:1;
unsigned version:3;
unsigned mr:1;
unsigned _r1:1;
unsigned gv:1;
unsigned tv:1;
uint8_t seq_number;
unsigned _r2:7;
unsigned tu:1;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
unsigned tv:1;
unsigned gv:1;
unsigned _r1:1;
unsigned mr:1;
unsigned version:3;
unsigned sv:1;
uint8_t seq_num;
unsigned tu:1;
unsigned _r2:7;
#endif
uint64_t stream_id;
uint32_t timestamp;
#define SPA_AVBTP_AAF_FORMAT_USER 0x00
#define SPA_AVBTP_AAF_FORMAT_FLOAT_32BIT 0x01
#define SPA_AVBTP_AAF_FORMAT_INT_32BIT 0x02
#define SPA_AVBTP_AAF_FORMAT_INT_24BIT 0x03
#define SPA_AVBTP_AAF_FORMAT_INT_16BIT 0x04
#define SPA_AVBTP_AAF_FORMAT_AES3_32BIT 0x05
uint8_t format;
#define SPA_AVBTP_AAF_PCM_NSR_USER 0x00
#define SPA_AVBTP_AAF_PCM_NSR_8KHZ 0x01
#define SPA_AVBTP_AAF_PCM_NSR_16KHZ 0x02
#define SPA_AVBTP_AAF_PCM_NSR_32KHZ 0x03
#define SPA_AVBTP_AAF_PCM_NSR_44_1KHZ 0x04
#define SPA_AVBTP_AAF_PCM_NSR_48KHZ 0x05
#define SPA_AVBTP_AAF_PCM_NSR_88_2KHZ 0x06
#define SPA_AVBTP_AAF_PCM_NSR_96KHZ 0x07
#define SPA_AVBTP_AAF_PCM_NSR_176_4KHZ 0x08
#define SPA_AVBTP_AAF_PCM_NSR_192KHZ 0x09
#define SPA_AVBTP_AAF_PCM_NSR_24KHZ 0x0A
#if __BYTE_ORDER == __BIG_ENDIAN
unsigned nsr:4;
unsigned _r3:4;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
unsigned _r3:4;
unsigned nsr:4;
#endif
uint8_t chan_per_frame;
uint8_t bit_depth;
uint16_t data_len;
#define SPA_AVBTP_AAF_PCM_SP_NORMAL 0x00
#define SPA_AVBTP_AAF_PCM_SP_SPARSE 0x01
#if __BYTE_ORDER == __BIG_ENDIAN
unsigned _r4:3;
unsigned sp:1;
unsigned event:4;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
unsigned event:4;
unsigned sp:1;
unsigned _r4:3;
#endif
uint8_t _r5;
uint8_t payload[0];
} __attribute__ ((__packed__));
#define SPA_AVBTP_PACKET_AAF_SET_SUBTYPE(p,v) ((p)->subtype = (v))
#define SPA_AVBTP_PACKET_AAF_SET_SV(p,v) ((p)->sv = (v))
#define SPA_AVBTP_PACKET_AAF_SET_VERSION(p,v) ((p)->version = (v))
#define SPA_AVBTP_PACKET_AAF_SET_MR(p,v) ((p)->mr = (v))
#define SPA_AVBTP_PACKET_AAF_SET_GV(p,v) ((p)->gv = (v))
#define SPA_AVBTP_PACKET_AAF_SET_TV(p,v) ((p)->tv = (v))
#define SPA_AVBTP_PACKET_AAF_SET_SEQ_NUM(p,v) ((p)->seq_num = (v))
#define SPA_AVBTP_PACKET_AAF_SET_TU(p,v) ((p)->tu = (v))
#define SPA_AVBTP_PACKET_AAF_SET_STREAM_ID(p,v) ((p)->stream_id = htobe64(v))
#define SPA_AVBTP_PACKET_AAF_SET_TIMESTAMP(p,v) ((p)->timestamp = htonl(v))
#define SPA_AVBTP_PACKET_AAF_SET_DATA_LEN(p,v) ((p)->data_len = htons(v))
#define SPA_AVBTP_PACKET_AAF_SET_FORMAT(p,v) ((p)->format = (v))
#define SPA_AVBTP_PACKET_AAF_SET_NSR(p,v) ((p)->nsr = (v))
#define SPA_AVBTP_PACKET_AAF_SET_CHAN_PER_FRAME(p,v) ((p)->chan_per_frame = (v))
#define SPA_AVBTP_PACKET_AAF_SET_BIT_DEPTH(p,v) ((p)->bit_depth = (v))
#define SPA_AVBTP_PACKET_AAF_SET_SP(p,v) ((p)->sp = (v))
#define SPA_AVBTP_PACKET_AAF_SET_EVENT(p,v) ((p)->event = (v))
#define SPA_AVBTP_PACKET_AAF_GET_SUBTYPE(p) ((p)->subtype)
#define SPA_AVBTP_PACKET_AAF_GET_SV(p) ((p)->sv)
#define SPA_AVBTP_PACKET_AAF_GET_VERSION(p) ((p)->version)
#define SPA_AVBTP_PACKET_AAF_GET_MR(p) ((p)->mr)
#define SPA_AVBTP_PACKET_AAF_GET_GV(p) ((p)->gv)
#define SPA_AVBTP_PACKET_AAF_GET_TV(p) ((p)->tv)
#define SPA_AVBTP_PACKET_AAF_GET_SEQ_NUM(p) ((p)->seq_num)
#define SPA_AVBTP_PACKET_AAF_GET_TU(p) ((p)->tu)
#define SPA_AVBTP_PACKET_AAF_GET_STREAM_ID(p) be64toh((p)->stream_id)
#define SPA_AVBTP_PACKET_AAF_GET_TIMESTAMP(p) ntohl((p)->timestamp)
#define SPA_AVBTP_PACKET_AAF_GET_DATA_LEN(p) ntohs((p)->data_len)
#define SPA_AVBTP_PACKET_AAF_GET_FORMAT(p) ((p)->format)
#define SPA_AVBTP_PACKET_AAF_GET_NSR(p) ((p)->nsr)
#define SPA_AVBTP_PACKET_AAF_GET_CHAN_PER_FRAME(p) ((p)->chan_per_frame)
#define SPA_AVBTP_PACKET_AAF_GET_BIT_DEPTH(p) ((p)->bit_depth)
#define SPA_AVBTP_PACKET_AAF_GET_SP(p) ((p)->sp)
#define SPA_AVBTP_PACKET_AAF_GET_EVENT(p) ((p)->event)
#endif /* SPA_AVB_PACKETS_H */

View file

@ -9,7 +9,7 @@ spa_avb = shared_library(
[ spa_avb_sources ],
c_args : acp_c_args,
include_directories : [configinc],
dependencies : [ spa_dep, mathlib, epoll_shim_dep, libavtp_dep ],
dependencies : [ spa_dep, mathlib, epoll_shim_dep ],
install : true,
install_dir : spa_plugindir / 'avb'
)