mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: fix minor issues / warnings

Browse source 
Make static analysis happier.
This commit is contained in:
Pauli Virtanen 2022-07-20 15:19:37 +03:00 • committed by Wim Taymans
parent 38b3d027ec
commit 67c41336db
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -469,10 +469,10 @@ static void *codec_init(const struct a2dp_codec *codec, uint32_t flags,
error_errno: error_errno:
res = -errno; res = -errno;
error: error:
if (this->ldac) if (this && this->ldac)
ldacBT_free_handle(this->ldac); ldacBT_free_handle(this->ldac);
#ifdef ENABLE_LDAC_ABR #ifdef ENABLE_LDAC_ABR
if (this->ldac_abr) if (this && this->ldac_abr)
ldac_ABR_free_handle(this->ldac_abr); ldac_ABR_free_handle(this->ldac_abr);
#endif #endif
free(this); free(this);

5
spa/plugins/bluez5/a2dp-codec-opus.c
View file

@ -479,6 +479,7 @@ static int get_mapping(const struct a2dp_codec *codec, const a2dp_opus_05_direct
m->coupled_streams == coupled_streams && m->coupled_streams == coupled_streams &&
m->location == location) m->location == location)
{ {
spa_assert(channels <= SPA_N_ELEMENTS(m->inv_mapping));
permutation = m->inv_mapping; permutation = m->inv_mapping;
if (surround_mapping) if (surround_mapping)
*surround_mapping = m->mapping; *surround_mapping = m->mapping;
@ -960,7 +961,7 @@ static void *codec_init(const struct a2dp_codec *codec, uint32_t flags,
opus_multistream_encoder_ctl(this->enc, OPUS_SET_BITRATE(this->e.bitrate)); opus_multistream_encoder_ctl(this->enc, OPUS_SET_BITRATE(this->e.bitrate));
this->e.samples = this->e.frame_dms * this->samplerate / 10000; this->e.samples = this->e.frame_dms * this->samplerate / 10000;
this->e.codesize = this->e.samples * this->channels * sizeof(float); this->e.codesize = this->e.samples * (int)this->channels * sizeof(float);
/* /*
@ -1198,7 +1199,7 @@ static SPA_UNUSED int codec_decode(void *data,
res = opus_multistream_decode_float(this->dec, src, src_size, dst, dst_samples, 0); res = opus_multistream_decode_float(this->dec, src, src_size, dst, dst_samples, 0);
if (res < 0) if (res < 0)
return -EINVAL; return -EINVAL;
*dst_out = res * this->channels * sizeof(float); *dst_out = (size_t)res * this->channels * sizeof(float);
return consumed; return consumed;
} }