mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: improve a2dp codec api

Browse source 
Pass dict to select_config to influence the selection
Make a method to validate a config.
Add spa_dict to the codec to pass more info around.
This commit is contained in:
Wim Taymans 2021-01-07 17:28:49 +01:00
parent 1ca3998b41
commit ece8a95c29
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/plugins/bluez5/a2dp-codec-aac.c
View file

@ -103,7 +103,7 @@ static struct {
static int codec_select_config(const struct a2dp_codec *codec, uint32_t flags, static int codec_select_config(const struct a2dp_codec *codec, uint32_t flags,
const void *caps, size_t caps_size, const void *caps, size_t caps_size,
const struct spa_audio_info *info, uint8_t config[A2DP_MAX_CAPS_SIZE]) const struct spa_dict *info, uint8_t config[A2DP_MAX_CAPS_SIZE])
{ {
a2dp_aac_t conf; a2dp_aac_t conf;
int freq; int freq;

2
spa/plugins/bluez5/a2dp-codec-aptx.c
View file

@ -76,7 +76,7 @@ static int codec_fill_caps(const struct a2dp_codec *codec, uint32_t flags,
static int codec_select_config(const struct a2dp_codec *codec, uint32_t flags, static int codec_select_config(const struct a2dp_codec *codec, uint32_t flags,
const void *caps, size_t caps_size, const void *caps, size_t caps_size,
const struct spa_audio_info *info, uint8_t config[A2DP_MAX_CAPS_SIZE]) const struct spa_dict *info, uint8_t config[A2DP_MAX_CAPS_SIZE])
{ {
a2dp_aptx_t conf; a2dp_aptx_t conf;
size_t actual_conf_size = codec_get_caps_size(codec); size_t actual_conf_size = codec_get_caps_size(codec);

2
spa/plugins/bluez5/a2dp-codec-ldac.c
View file

@ -128,7 +128,7 @@ static int codec_fill_caps(const struct a2dp_codec *codec, uint32_t flags, uint8
static int codec_select_config(const struct a2dp_codec *codec, uint32_t flags, static int codec_select_config(const struct a2dp_codec *codec, uint32_t flags,
const void *caps, size_t caps_size, const void *caps, size_t caps_size,
const struct spa_audio_info *info, uint8_t config[A2DP_MAX_CAPS_SIZE]) const struct spa_dict *info, uint8_t config[A2DP_MAX_CAPS_SIZE])
{ {
a2dp_ldac_t conf; a2dp_ldac_t conf;

2
spa/plugins/bluez5/a2dp-codec-sbc.c
View file

@ -119,7 +119,7 @@ static uint8_t default_bitpool(uint8_t freq, uint8_t mode)
static int codec_select_config(const struct a2dp_codec *codec, uint32_t flags, static int codec_select_config(const struct a2dp_codec *codec, uint32_t flags,
const void *caps, size_t caps_size, const void *caps, size_t caps_size,
const struct spa_audio_info *info, uint8_t config[A2DP_MAX_CAPS_SIZE]) const struct spa_dict *info, uint8_t config[A2DP_MAX_CAPS_SIZE])
{ {
a2dp_sbc_t conf; a2dp_sbc_t conf;
int bitpool; int bitpool;

8
spa/plugins/bluez5/a2dp-codecs.h
View file

@ -325,13 +325,12 @@ static inline int a2dp_sbc_get_frequency(a2dp_sbc_t *config)
struct a2dp_codec_handle; struct a2dp_codec_handle;
struct a2dp_codec { struct a2dp_codec {
uint32_t flags;
uint8_t codec_id; uint8_t codec_id;
a2dp_vendor_codec_t vendor; a2dp_vendor_codec_t vendor;
const char *name; const char *name;
const char *description; const char *description;
const struct spa_dict *info;
const int send_fill_frames; const int send_fill_frames;
const int recv_fill_frames; const int recv_fill_frames;
@ -340,10 +339,13 @@ struct a2dp_codec {
uint8_t caps[A2DP_MAX_CAPS_SIZE]); uint8_t caps[A2DP_MAX_CAPS_SIZE]);
int (*select_config) (const struct a2dp_codec *codec, uint32_t flags, int (*select_config) (const struct a2dp_codec *codec, uint32_t flags,
const void *caps, size_t caps_size, const void *caps, size_t caps_size,
const struct spa_audio_info *info, uint8_t config[A2DP_MAX_CAPS_SIZE]); const struct spa_dict *info, uint8_t config[A2DP_MAX_CAPS_SIZE]);
int (*enum_config) (const struct a2dp_codec *codec, int (*enum_config) (const struct a2dp_codec *codec,
const void *caps, size_t caps_size, uint32_t id, uint32_t idx, const void *caps, size_t caps_size, uint32_t id, uint32_t idx,
struct spa_pod_builder *builder, struct spa_pod **param); struct spa_pod_builder *builder, struct spa_pod **param);
int (*validate_config) (const struct a2dp_codec *codec, uint32_t flags,
const void *caps, size_t caps_size,
struct spa_audio_info *info);
void *(*init) (const struct a2dp_codec *codec, uint32_t flags, void *config, size_t config_size, void *(*init) (const struct a2dp_codec *codec, uint32_t flags, void *config, size_t config_size,
const struct spa_audio_info *info, size_t mtu); const struct spa_audio_info *info, size_t mtu);