mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Make GStreamer threads realtime

Browse source 
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/440>
This commit is contained in:
Igor V. Kovalenko 2021-01-04 19:40:08 +03:00 • committed by Sanchayan Maity
parent 8289bdb76d
commit 366bd5615c
7 changed files with 51 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/bluetooth/a2dp-codec-api.h
View file

@ -69,7 +69,7 @@ typedef struct pa_a2dp_codec {
/* Initialize codec, returns codec info data and set sample_spec, /* Initialize codec, returns codec info data and set sample_spec,
* for_encoding is true when codec_info is used for encoding, * for_encoding is true when codec_info is used for encoding,
* for_backchannel is true when codec_info is used for backchannel */ * for_backchannel is true when codec_info is used for backchannel */
void *(*init)(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec); void *(*init)(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec, pa_core *core);
/* Deinitialize and release codec info data in codec_info */ /* Deinitialize and release codec info data in codec_info */
void (*deinit)(void *codec_info); void (*deinit)(void *codec_info);
/* Reset internal state of codec info data in codec_info, returns /* Reset internal state of codec info data in codec_info, returns

8
src/modules/bluetooth/a2dp-codec-aptx-gst.c
View file

@ -266,12 +266,12 @@ static uint8_t fill_preferred_configuration_hd(const pa_sample_spec *default_sam
return sizeof(*config); return sizeof(*config);
} }
static void *init(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec) { static void *init(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec, pa_core *core) {
return gst_codec_init(APTX, config_buffer, config_size, sample_spec); return gst_codec_init(APTX, config_buffer, config_size, sample_spec, core);
} }
static void *init_hd(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec) { static void *init_hd(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec, pa_core *core) {
return gst_codec_init(APTX_HD, config_buffer, config_size, sample_spec); return gst_codec_init(APTX_HD, config_buffer, config_size, sample_spec, core);
} }
static void deinit(void *codec_info) { static void deinit(void *codec_info) {

276
src/modules/bluetooth/a2dp-codec-gst.c
View file

@ -28,6 +28,7 @@
#include <pulsecore/once.h> #include <pulsecore/once.h>
#include <pulsecore/core-util.h> #include <pulsecore/core-util.h>
#include <pulse/sample.h> #include <pulse/sample.h>
#include <pulse/util.h>
#include "a2dp-codecs.h" #include "a2dp-codecs.h"
#include "a2dp-codec-api.h" #include "a2dp-codec-api.h"
@ -115,251 +116,34 @@ static void gst_deinit_dec_common(struct gst_info *info) {
gst_object_unref(info->dec_pipeline); gst_object_unref(info->dec_pipeline);
} }
static bool gst_init_ldac(struct gst_info *info, pa_sample_spec *ss) { static GstBusSyncReply sync_bus_handler (GstBus *bus, GstMessage *message, struct gst_info *info) {
GstElement *rtpldacpay; GstStreamStatusType type;
GstElement *enc; GstElement *owner;
GstCaps *caps;
ss->format = PA_SAMPLE_S32LE; switch (GST_MESSAGE_TYPE (message)) {
case GST_MESSAGE_STREAM_STATUS:
switch (info->a2dp_codec_t.ldac_config->frequency) { gst_message_parse_stream_status (message, &type, &owner);
case LDAC_SAMPLING_FREQ_44100:
ss->rate = 44100u; switch (type) {
break; case GST_STREAM_STATUS_TYPE_ENTER:
case LDAC_SAMPLING_FREQ_48000: pa_log_debug("GStreamer pipeline thread starting up");
ss->rate = 48000u; if (info->core->realtime_scheduling)
break; pa_thread_make_realtime(info->core->realtime_priority);
case LDAC_SAMPLING_FREQ_88200: break;
ss->rate = 88200; case GST_STREAM_STATUS_TYPE_LEAVE:
break; pa_log_debug("GStreamer pipeline thread shutting down");
case LDAC_SAMPLING_FREQ_96000: break;
ss->rate = 96000; default:
break; break;
}
break;
default: default:
pa_log_error("LDAC invalid frequency %d", info->a2dp_codec_t.ldac_config->frequency);
goto fail;
}
switch (info->a2dp_codec_t.ldac_config->channel_mode) {
case LDAC_CHANNEL_MODE_STEREO:
ss->channels = 2;
break; break;
case LDAC_CHANNEL_MODE_MONO:
ss->channels = 1;
break;
case LDAC_CHANNEL_MODE_DUAL:
ss->channels = 1;
break;
default:
pa_log_error("LDAC invalid channel mode %d", info->a2dp_codec_t.ldac_config->channel_mode);
goto fail;
} }
enc = gst_element_factory_make("ldacenc", "ldac_enc"); /* pass all messages on the async queue */
if (!enc) { return GST_BUS_PASS;
pa_log_error("Could not create LDAC encoder element");
goto fail;
}
switch (info->codec_type) {
case LDAC_EQMID_HQ:
g_object_set(enc, "eqmid", 0, NULL);
break;
case LDAC_EQMID_SQ:
g_object_set(enc, "eqmid", 1, NULL);
break;
case LDAC_EQMID_MQ:
g_object_set(enc, "eqmid", 2, NULL);
break;
default:
goto fail;
}
caps = gst_caps_new_simple("audio/x-raw",
"format", G_TYPE_STRING, "S32LE",
"rate", G_TYPE_INT, (int) ss->rate,
"channels", G_TYPE_INT, (int) ss->channels,
"channel-mask", G_TYPE_INT, 0,
"layout", G_TYPE_STRING, "interleaved",
NULL);
g_object_set(info->enc_src, "caps", caps, NULL);
gst_caps_unref(caps);
rtpldacpay = gst_element_factory_make("rtpldacpay", "rtp_ldac_pay");
if (!rtpldacpay) {
pa_log_error("Could not create RTP LDAC payloader element");
goto fail;
}
gst_bin_add_many(GST_BIN(info->enc_pipeline), info->enc_src, enc, rtpldacpay, info->enc_sink, NULL);
if (!gst_element_link_many(info->enc_src, enc, rtpldacpay, info->enc_sink, NULL)) {
pa_log_error("Failed to link elements for LDAC encoder");
goto bin_remove;
}
if (gst_element_set_state(info->enc_pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
pa_log_error("Could not start LDAC encoder pipeline");
goto bin_remove;
}
info->gst_enc = enc;
return true;
bin_remove:
gst_bin_remove_many(GST_BIN(info->enc_pipeline), info->enc_src, enc, rtpldacpay, info->enc_sink, NULL);
fail:
pa_log_error("LDAC encoder initialisation failed");
return false;
}
static bool gst_init_aptx(struct gst_info *info, pa_sample_spec *ss) {
GstElement *enc, *dec;
GstCaps *caps;
const char *aptx_codec_media_type;
ss->format = PA_SAMPLE_S24LE;
if (info->codec_type == APTX_HD) {
switch (info->a2dp_codec_t.aptx_hd_config->aptx.frequency) {
case APTX_SAMPLING_FREQ_16000:
ss->rate = 16000u;
break;
case APTX_SAMPLING_FREQ_32000:
ss->rate = 32000u;
break;
case APTX_SAMPLING_FREQ_44100:
ss->rate = 44100u;
break;
case APTX_SAMPLING_FREQ_48000:
ss->rate = 48000u;
break;
default:
pa_log_error("aptX HD invalid frequency %d", info->a2dp_codec_t.aptx_hd_config->aptx.frequency);
goto fail;
}
switch (info->a2dp_codec_t.aptx_hd_config->aptx.channel_mode) {
case APTX_CHANNEL_MODE_STEREO:
ss->channels = 2;
break;
default:
pa_log_error("aptX HD invalid channel mode %d", info->a2dp_codec_t.aptx_hd_config->aptx.frequency);
goto fail;
}
} else {
switch (info->a2dp_codec_t.aptx_config->frequency) {
case APTX_SAMPLING_FREQ_16000:
ss->rate = 16000u;
break;
case APTX_SAMPLING_FREQ_32000:
ss->rate = 32000u;
break;
case APTX_SAMPLING_FREQ_44100:
ss->rate = 44100u;
break;
case APTX_SAMPLING_FREQ_48000:
ss->rate = 48000u;
break;
default:
pa_log_error("aptX invalid frequency %d", info->a2dp_codec_t.aptx_config->frequency);
goto fail;
}
switch (info->a2dp_codec_t.aptx_config->channel_mode) {
case APTX_CHANNEL_MODE_STEREO:
ss->channels = 2;
break;
default:
pa_log_error("aptX invalid channel mode %d", info->a2dp_codec_t.aptx_config->frequency);
goto fail;
}
}
enc = gst_element_factory_make("openaptxenc", "aptx_encoder");
if (enc == NULL) {
pa_log_error("Could not create aptX encoder element");
goto fail;
}
dec = gst_element_factory_make("openaptxdec", "aptx_decoder");
if (dec == NULL) {
pa_log_error("Could not create aptX decoder element");
goto fail;
}
aptx_codec_media_type = info->codec_type == APTX_HD ? "audio/aptx-hd" : "audio/aptx";
caps = gst_caps_new_simple("audio/x-raw",
"format", G_TYPE_STRING, "S24LE",
"rate", G_TYPE_INT, (int) ss->rate,
"channels", G_TYPE_INT, (int) ss->channels,
"channel-mask", G_TYPE_INT, 0,
"layout", G_TYPE_STRING, "interleaved",
NULL);
g_object_set(info->enc_src, "caps", caps, NULL);
gst_caps_unref(caps);
caps = gst_caps_new_simple(aptx_codec_media_type,
"rate", G_TYPE_INT, (int) ss->rate,
"channels", G_TYPE_INT, (int) ss->channels,
NULL);
g_object_set(info->enc_sink, "caps", caps, NULL);
gst_caps_unref(caps);
caps = gst_caps_new_simple(aptx_codec_media_type,
"rate", G_TYPE_INT, (int) ss->rate,
"channels", G_TYPE_INT, (int) ss->channels,
NULL);
g_object_set(info->dec_src, "caps", caps, NULL);
gst_caps_unref(caps);
caps = gst_caps_new_simple("audio/x-raw",
"format", G_TYPE_STRING, "S24LE",
"rate", G_TYPE_INT, (int) ss->rate,
"channels", G_TYPE_INT, (int) ss->channels,
"layout", G_TYPE_STRING, "interleaved",
NULL);
g_object_set(info->dec_sink, "caps", caps, NULL);
gst_caps_unref(caps);
gst_bin_add_many(GST_BIN(info->enc_pipeline), info->enc_src, enc, info->enc_sink, NULL);
gst_bin_add_many(GST_BIN(info->dec_pipeline), info->dec_src, dec, info->dec_sink, NULL);
if (!gst_element_link_many(info->enc_src, enc, info->enc_sink, NULL)) {
pa_log_error("Failed to link elements for aptX encoder");
goto bin_remove;
}
if (!gst_element_link_many(info->dec_src, dec, info->dec_sink, NULL)) {
pa_log_error("Failed to link elements for aptX decoder");
goto bin_remove;
}
if (gst_element_set_state(info->enc_pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
pa_log_error("Could not start aptX encoder pipeline");
goto bin_remove;
}
if (gst_element_set_state(info->dec_pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
pa_log_error("Could not start aptX decoder pipeline");
goto bin_remove;
}
info->gst_enc = enc;
info->gst_dec = dec;
return true;
bin_remove:
gst_bin_remove_many(GST_BIN(info->enc_pipeline), info->enc_src, enc, info->enc_sink, NULL);
gst_bin_remove_many(GST_BIN(info->dec_pipeline), info->dec_src, dec, info->dec_sink, NULL);
fail:
pa_log_error("aptX initialisation failed");
return false;
} }
static bool gst_init_enc_common(struct gst_info *info, pa_sample_spec *ss) { static bool gst_init_enc_common(struct gst_info *info, pa_sample_spec *ss) {
@ -367,6 +151,7 @@ static bool gst_init_enc_common(struct gst_info *info, pa_sample_spec *ss) {
GstElement *appsrc = NULL, *appsink = NULL; GstElement *appsrc = NULL, *appsink = NULL;
GstAdapter *adapter; GstAdapter *adapter;
GstAppSinkCallbacks callbacks = { 0, }; GstAppSinkCallbacks callbacks = { 0, };
GstBus *bus;
appsrc = gst_element_factory_make("appsrc", "enc_source"); appsrc = gst_element_factory_make("appsrc", "enc_source");
if (!appsrc) { if (!appsrc) {
@ -392,6 +177,10 @@ static bool gst_init_enc_common(struct gst_info *info, pa_sample_spec *ss) {
pipeline = gst_pipeline_new(NULL); pipeline = gst_pipeline_new(NULL);
pa_assert(pipeline); pa_assert(pipeline);
bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
gst_bus_set_sync_handler (bus, (GstBusSyncHandler) sync_bus_handler, info, NULL);
gst_object_unref (bus);
info->enc_src = appsrc; info->enc_src = appsrc;
info->enc_sink = appsink; info->enc_sink = appsink;
info->enc_adapter = adapter; info->enc_adapter = adapter;
@ -411,6 +200,7 @@ static bool gst_init_dec_common(struct gst_info *info, pa_sample_spec *ss) {
GstElement *appsrc = NULL, *appsink = NULL; GstElement *appsrc = NULL, *appsink = NULL;
GstAdapter *adapter; GstAdapter *adapter;
GstAppSinkCallbacks callbacks = { 0, }; GstAppSinkCallbacks callbacks = { 0, };
GstBus *bus;
appsrc = gst_element_factory_make("appsrc", "dec_source"); appsrc = gst_element_factory_make("appsrc", "dec_source");
if (!appsrc) { if (!appsrc) {
@ -436,6 +226,10 @@ static bool gst_init_dec_common(struct gst_info *info, pa_sample_spec *ss) {
pipeline = gst_pipeline_new(NULL); pipeline = gst_pipeline_new(NULL);
pa_assert(pipeline); pa_assert(pipeline);
bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
gst_bus_set_sync_handler (bus, (GstBusSyncHandler) sync_bus_handler, info, NULL);
gst_object_unref (bus);
info->dec_src = appsrc; info->dec_src = appsrc;
info->dec_sink = appsink; info->dec_sink = appsink;
info->dec_adapter = adapter; info->dec_adapter = adapter;
@ -573,13 +367,15 @@ fail:
return false; return false;
} }
void *gst_codec_init(enum a2dp_codec_type codec_type, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *ss) { void *gst_codec_init(enum a2dp_codec_type codec_type, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *ss, pa_core *core) {
struct gst_info *info = NULL; struct gst_info *info = NULL;
bool ret; bool ret;
info = pa_xnew0(struct gst_info, 1); info = pa_xnew0(struct gst_info, 1);
pa_assert(info); pa_assert(info);
info->core = core;
switch (codec_type) { switch (codec_type) {
case AAC: case AAC:
info->codec_type = AAC; info->codec_type = AAC;

3
src/modules/bluetooth/a2dp-codec-gst.h
View file

@ -33,6 +33,7 @@ enum a2dp_codec_type {
}; };
struct gst_info { struct gst_info {
pa_core *core;
pa_sample_spec *ss; pa_sample_spec *ss;
enum a2dp_codec_type codec_type; enum a2dp_codec_type codec_type;
union { union {
@ -54,7 +55,7 @@ struct gst_info {
uint16_t seq_num; uint16_t seq_num;
}; };
void *gst_codec_init(enum a2dp_codec_type codec_type, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *ss); void *gst_codec_init(enum a2dp_codec_type codec_type, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *ss, pa_core *core);
size_t gst_encode_buffer(void *codec_info, uint32_t timestamp, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed); size_t gst_encode_buffer(void *codec_info, uint32_t timestamp, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed);
size_t gst_decode_buffer(void *codec_info, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed); size_t gst_decode_buffer(void *codec_info, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed);
void gst_codec_deinit(void *codec_info); void gst_codec_deinit(void *codec_info);

12
src/modules/bluetooth/a2dp-codec-ldac-gst.c
View file

@ -195,16 +195,16 @@ static uint8_t fill_preferred_configuration(const pa_sample_spec *default_sample
return sizeof(*config); return sizeof(*config);
} }
static void *init_hq(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec) { static void *init_hq(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec, pa_core *core) {
return gst_codec_init(LDAC_EQMID_HQ, config_buffer, config_size, sample_spec); return gst_codec_init(LDAC_EQMID_HQ, config_buffer, config_size, sample_spec, core);
} }
static void *init_sq(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec) { static void *init_sq(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec, pa_core *core) {
return gst_codec_init(LDAC_EQMID_SQ, config_buffer, config_size, sample_spec); return gst_codec_init(LDAC_EQMID_SQ, config_buffer, config_size, sample_spec, core);
} }
static void *init_mq(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec) { static void *init_mq(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec, pa_core *core) {
return gst_codec_init(LDAC_EQMID_MQ, config_buffer, config_size, sample_spec); return gst_codec_init(LDAC_EQMID_MQ, config_buffer, config_size, sample_spec, core);
} }
static void deinit(void *codec_info) { static void deinit(void *codec_info) {

2
src/modules/bluetooth/a2dp-codec-sbc.c
View file

@ -327,7 +327,7 @@ static void set_params(struct sbc_info *sbc_info) {
sbc_info->frame_length = sbc_get_frame_length(&sbc_info->sbc); sbc_info->frame_length = sbc_get_frame_length(&sbc_info->sbc);
} }
static void *init(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec) { static void *init(bool for_encoding, bool for_backchannel, const uint8_t *config_buffer, uint8_t config_size, pa_sample_spec *sample_spec, pa_core *core) {
struct sbc_info *sbc_info; struct sbc_info *sbc_info;
const a2dp_sbc_t *config = (const a2dp_sbc_t *) config_buffer; const a2dp_sbc_t *config = (const a2dp_sbc_t *) config_buffer;
int ret; int ret;

2
src/modules/bluetooth/module-bluez5-device.c
View file

@ -1256,7 +1256,7 @@ static int transport_config(struct userdata *u) {
u->a2dp_codec = u->transport->a2dp_codec; u->a2dp_codec = u->transport->a2dp_codec;
pa_assert(u->a2dp_codec); pa_assert(u->a2dp_codec);
info = u->a2dp_codec->init(is_a2dp_sink, false, u->transport->config, u->transport->config_size, is_a2dp_sink ? &u->encoder_sample_spec : &u->decoder_sample_spec); info = u->a2dp_codec->init(is_a2dp_sink, false, u->transport->config, u->transport->config_size, is_a2dp_sink ? &u->encoder_sample_spec : &u->decoder_sample_spec, u->core);
if (is_a2dp_sink) if (is_a2dp_sink)
u->encoder_info = info; u->encoder_info = info;
else else