Merge branch 'ldacBT' into 'master'

Draft: bluez5: Support ldacBT 2.1.0.0

See merge request pipewire/pipewire!2851
This commit is contained in:
EliasOfWaffle 2026-06-12 12:35:50 +00:00
commit cb389f165f
3 changed files with 33 additions and 6 deletions

View file

@ -471,7 +471,11 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags,
#endif
#ifdef ENABLE_LDAC_ABR
this->ldac_abr = ldac_ABR_get_handle();
#ifdef LDAC_ABR_HANDLE_NULL
this->ldac_abr = ldac_ABR_get_handle(NULL);
#else
this->ldac_abr = ldac_ABR_get_handle();
#endif
if (this->ldac_abr == NULL)
goto error_errno;
#endif

View file

@ -138,10 +138,12 @@ if ldac_dep.found()
ldac_args = codec_args
if ldac_abr_dep.found()
ldac_args += [ '-DENABLE_LDAC_ABR' ]
if ldac_abr_dep.version().version_compare('>=2.1.0.0')
ldac_args += [ '-DLDAC_ABR_HANDLE_NULL' ]
endif
endif
if get_option('bluez5-codec-ldac-dec').allowed() and ldac_dec_dep.found()
ldac_args += [ '-DENABLE_LDAC_DEC' ]
ldac_dep = [ldac_dep, ldac_dec_dep]
endif
bluez_codec_ldac = shared_library('spa-codec-bluez5-ldac',
[ 'a2dp-codec-ldac.c', 'media-codecs.c' ],