diff --git a/spa/include/spa/param/bluetooth/audio.h b/spa/include/spa/param/bluetooth/audio.h index c95e22d6d..34b45e297 100644 --- a/spa/include/spa/param/bluetooth/audio.h +++ b/spa/include/spa/param/bluetooth/audio.h @@ -41,6 +41,7 @@ enum spa_bluetooth_audio_codec { SPA_BLUETOOTH_AUDIO_CODEC_CVSD = 0x100, SPA_BLUETOOTH_AUDIO_CODEC_MSBC, SPA_BLUETOOTH_AUDIO_CODEC_LC3_SWB, + SPA_BLUETOOTH_AUDIO_CODEC_LC3_A127, /* BAP */ SPA_BLUETOOTH_AUDIO_CODEC_LC3 = 0x200, diff --git a/spa/include/spa/param/bluetooth/type-info.h b/spa/include/spa/param/bluetooth/type-info.h index a936cca5f..7bf1da52c 100644 --- a/spa/include/spa/param/bluetooth/type-info.h +++ b/spa/include/spa/param/bluetooth/type-info.h @@ -44,6 +44,7 @@ static const struct spa_type_info spa_type_bluetooth_audio_codec[] = { { SPA_BLUETOOTH_AUDIO_CODEC_CVSD, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "cvsd", NULL }, { SPA_BLUETOOTH_AUDIO_CODEC_MSBC, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "msbc", NULL }, { SPA_BLUETOOTH_AUDIO_CODEC_LC3_SWB, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "lc3_swb", NULL }, + { SPA_BLUETOOTH_AUDIO_CODEC_LC3_A127, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "lc3_a127", NULL }, { SPA_BLUETOOTH_AUDIO_CODEC_LC3, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "lc3", NULL }, diff --git a/spa/plugins/bluez5/codec-loader.c b/spa/plugins/bluez5/codec-loader.c index 1557d1f7c..68e6af756 100644 --- a/spa/plugins/bluez5/codec-loader.c +++ b/spa/plugins/bluez5/codec-loader.c @@ -53,6 +53,7 @@ static int codec_order(const struct media_codec *c) SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD, SPA_BLUETOOTH_AUDIO_CODEC_G722, SPA_BLUETOOTH_AUDIO_CODEC_LC3_SWB, + SPA_BLUETOOTH_AUDIO_CODEC_LC3_A127, SPA_BLUETOOTH_AUDIO_CODEC_MSBC, SPA_BLUETOOTH_AUDIO_CODEC_CVSD, }; @@ -192,6 +193,7 @@ const struct media_codec * const *load_media_codecs(struct spa_plugin_loader *lo MEDIA_CODEC_FACTORY_LIB("hfp-cvsd"), MEDIA_CODEC_FACTORY_LIB("hfp-msbc"), MEDIA_CODEC_FACTORY_LIB("hfp-lc3-swb"), + MEDIA_CODEC_FACTORY_LIB("hfp-lc3-a127"), #undef MEDIA_CODEC_FACTORY_LIB }; diff --git a/spa/plugins/bluez5/hfp-codec-lc3-a127.c b/spa/plugins/bluez5/hfp-codec-lc3-a127.c new file mode 100644 index 000000000..e3f077930 --- /dev/null +++ b/spa/plugins/bluez5/hfp-codec-lc3-a127.c @@ -0,0 +1,243 @@ +/* Spa HFP LC3-24kHz (Apple) Codec */ +/* SPDX-FileCopyrightText: Copyright © 2025 Pauli Virtanen */ +/* SPDX-License-Identifier: MIT */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "media-codecs.h" +#include "hfp-h2.h" + +#include + +#define LC3_A127_BLOCK_SIZE 720 + +static struct spa_log *log; + +struct impl { + lc3_encoder_t enc; + lc3_decoder_t dec; + + int prev_hwseq; + uint16_t seq; +}; + +static int codec_enum_config(const struct media_codec *codec, uint32_t flags, + const void *caps, size_t caps_size, uint32_t id, uint32_t idx, + struct spa_pod_builder *b, struct spa_pod **param) +{ + struct spa_pod_frame f[1]; + const uint32_t position[SPA_AUDIO_MAX_CHANNELS] = { SPA_AUDIO_CHANNEL_MONO }; + const int channels = 1; + + spa_assert(caps == NULL && caps_size == 0); + + if (idx > 0) + return 0; + + spa_pod_builder_push_object(b, &f[0], SPA_TYPE_OBJECT_Format, id); + spa_pod_builder_add(b, + SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_audio), + SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), + SPA_FORMAT_AUDIO_format, SPA_POD_Id(SPA_AUDIO_FORMAT_F32), + SPA_FORMAT_AUDIO_rate, SPA_POD_CHOICE_ENUM_Int(1, 24000), + SPA_FORMAT_AUDIO_channels, SPA_POD_Int(channels), + SPA_FORMAT_AUDIO_position, SPA_POD_Array(sizeof(uint32_t), + SPA_TYPE_Id, channels, position), + 0); + + *param = spa_pod_builder_pop(b, &f[0]); + return *param == NULL ? -EIO : 1; +} + +static int codec_validate_config(const struct media_codec *codec, uint32_t flags, + const void *caps, size_t caps_size, + struct spa_audio_info *info) +{ + spa_assert(caps == NULL && caps_size == 0); + + spa_zero(*info); + info->media_type = SPA_MEDIA_TYPE_audio; + info->media_subtype = SPA_MEDIA_SUBTYPE_raw; + info->info.raw.format = SPA_AUDIO_FORMAT_F32; + info->info.raw.rate = 24000; + info->info.raw.channels = 1; + info->info.raw.position[0] = SPA_AUDIO_CHANNEL_MONO; + return 0; +} + +static void *codec_init(const struct media_codec *codec, uint32_t flags, + void *config, size_t config_len, const struct spa_audio_info *info, + void *props, size_t mtu) +{ + struct impl *this = NULL; + + spa_assert(config == NULL && config_len == 0 && props == NULL); + + this = calloc(1, sizeof(*this)); + if (!this) + goto fail; + + this->enc = lc3_setup_encoder(7500, 24000, 0, + calloc(1, lc3_encoder_size(7500, 24000))); + if (!this->enc) + goto fail; + + this->dec = lc3_setup_decoder(7500, 24000, 0, + calloc(1, lc3_decoder_size(7500, 24000))); + if (!this->dec) + goto fail; + + spa_assert(lc3_frame_samples(7500, 24000) * sizeof(float) == LC3_A127_BLOCK_SIZE); + + this->prev_hwseq = -1; + return this; + +fail: + if (this) { + free(this->enc); + free(this->dec); + free(this); + } + return NULL; +} + +static void codec_deinit(void *data) +{ + struct impl *this = data; + + free(this->enc); + free(this->dec); + free(this); +} + +static int codec_get_block_size(void *data) +{ + return LC3_A127_BLOCK_SIZE; +} + +static int codec_start_encode (void *data, void *dst, size_t dst_size, + uint16_t seqnum, uint32_t timestamp) +{ + struct impl *this = data; + + this->seq = seqnum; + return 0; +} + +static int codec_encode(void *data, + const void *src, size_t src_size, + void *dst, size_t dst_size, + size_t *dst_out, int *need_flush) +{ + struct impl *this = data; + uint8_t *buf = dst; + int res; + + if (src_size < LC3_A127_BLOCK_SIZE) + return -EINVAL; + if (dst_size < H2_PACKET_SIZE) + return -EINVAL; + + buf[0] = this->seq; + buf[1] = H2_PACKET_SIZE - 2; + this->seq++; + + res = lc3_encode(this->enc, LC3_PCM_FORMAT_FLOAT, src, 1, + H2_PACKET_SIZE - 2, SPA_PTROFF(buf, 2, void)); + if (res != 0) + return -EINVAL; + + *dst_out = H2_PACKET_SIZE; + *need_flush = NEED_FLUSH_ALL; + return LC3_A127_BLOCK_SIZE; +} + +static int codec_start_decode (void *data, + const void *src, size_t src_size, uint16_t *seqnum, uint32_t *timestamp) +{ + struct impl *this = data; + const uint8_t *buf = src; + + if (is_zero_packet(src, src_size)) + return -EINVAL; + if (src_size < 2) + return -EINVAL; + if (buf[1] != H2_PACKET_SIZE - 2) + return -EINVAL; + + if (this->prev_hwseq >= 0) + this->seq += (uint8_t)(buf[0] - this->prev_hwseq); + this->prev_hwseq = buf[0]; + + if (seqnum) + *seqnum = this->seq; + if (timestamp) + *timestamp = 0; + + return 2; +} + +static int codec_decode(void *data, + const void *src, size_t src_size, + void *dst, size_t dst_size, + size_t *dst_out) +{ + struct impl *this = data; + int res; + + *dst_out = 0; + + if (src_size < H2_PACKET_SIZE - 2) + return -EINVAL; + if (dst_size < LC3_A127_BLOCK_SIZE) + return -EINVAL; + + res = lc3_decode(this->dec, src, H2_PACKET_SIZE - 2, LC3_PCM_FORMAT_FLOAT, dst, 1); + if (res) + return -EINVAL; + + *dst_out = LC3_A127_BLOCK_SIZE; + return H2_PACKET_SIZE - 2; +} + +static void codec_set_log(struct spa_log *global_log) +{ + log = global_log; + spa_log_topic_init(log, &codec_plugin_log_topic); +} + +static const struct media_codec hfp_codec_a127 = { + .id = SPA_BLUETOOTH_AUDIO_CODEC_LC3_A127, + .kind = MEDIA_CODEC_HFP, + .codec_id = 127, + .enum_config = codec_enum_config, + .validate_config = codec_validate_config, + .init = codec_init, + .deinit = codec_deinit, + .get_block_size = codec_get_block_size, + .start_encode = codec_start_encode, + .encode = codec_encode, + .set_log = codec_set_log, + .start_decode = codec_start_decode, + .decode = codec_decode, + .name = "lc3_a127", + .description = "LC3-24kHz", +}; + +MEDIA_CODEC_EXPORT_DEF( + "hfp-lc3-a127", + &hfp_codec_a127 +); diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build index 13c46ad87..97eae0d79 100644 --- a/spa/plugins/bluez5/meson.build +++ b/spa/plugins/bluez5/meson.build @@ -199,6 +199,14 @@ if get_option('bluez5-codec-lc3').allowed() and lc3_dep.found() dependencies : [ spa_dep, lc3_dep, mathlib ], install : true, install_dir : spa_plugindir / 'bluez5') + + bluez_codec_hfp_lc3_a127 = shared_library('spa-codec-bluez5-hfp-lc3-a127', + [ 'hfp-codec-lc3-a127.c', 'media-codecs.c' ], + include_directories : [ configinc ], + c_args : codec_args, + dependencies : [ spa_dep, lc3_dep, mathlib ], + install : true, + install_dir : spa_plugindir / 'bluez5') endif if get_option('bluez5-codec-g722').allowed()