mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-03-06 01:40:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: account for codec internal delay in latency values

Browse source 
Encoders and some decoders have additional internal latency that needs
to be accounted for.

This mostly matters for AAC (~40ms), as the other BT codecs have much
lower delays (~5ms).
This commit is contained in:
Pauli Virtanen 2024-02-23 21:04:47 +02:00 • committed by Wim Taymans
parent 1b3b577b8f
commit 2d30ab94c2
10 changed files with 151 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,6 +80,8 @@ struct dec_data {
int fragment_size;
int fragment_count;
uint8_t fragment[OPUS_05_MAX_BYTES];
int32_t delay;
};
struct abr {
@ -119,6 +121,8 @@ struct enc_data {
int frame_dms;
int application;
int32_t delay;
};
struct impl {
@ -1005,6 +1009,7 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags,
this->e.samples = this->e.frame_dms * this->samplerate / 10000;
this->e.codesize = this->e.samples * (int)this->channels * sizeof(float);
opus_multistream_encoder_ctl(this->enc, OPUS_GET_LOOKAHEAD(&this->e.delay));
/*
* Setup decoder
@ -1020,6 +1025,8 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags,
goto error;
}
opus_multistream_decoder_ctl(this->dec, OPUS_GET_LOOKAHEAD(&this->d.delay));
return this;
error_errno:
@ -1325,6 +1332,16 @@ static int codec_increase_bitpool(void *data)
return 0;
}
static void codec_get_delay(void *data, uint32_t *encoder, uint32_t *decoder)
{
struct impl *this = data;
if (encoder)
*encoder = this->e.delay;
if (decoder)
*decoder = this->d.delay;
}
static void codec_set_log(struct spa_log *global_log)
{
log = global_log;
@ -1347,7 +1364,8 @@ static void codec_set_log(struct spa_log *global_log)
.encode = codec_encode, \
.reduce_bitpool = codec_reduce_bitpool, \
.increase_bitpool = codec_increase_bitpool, \
.set_log = codec_set_log
.set_log = codec_set_log, \
.get_delay = codec_get_delay
#define OPUS_05_COMMON_FULL_DEFS \
OPUS_05_COMMON_DEFS, \