mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: export log topic enumerations

Browse source
This commit is contained in:
Pauli Virtanen 2023-12-23 21:07:45 +02:00 • committed by Wim Taymans
parent fc4dbcd033
commit eaea03c26c
40 changed files with 74 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/plugins/aec/aec-null.c
View file

@ -18,7 +18,7 @@ struct impl {
uint32_t channels;
};
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.aec.null");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.aec.null");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
@ -137,6 +137,8 @@ static const struct spa_handle_factory spa_aec_null_factory = {
impl_enum_interface_info,
};
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)
{

6
spa/plugins/aec/aec-webrtc.cpp
View file

@ -35,7 +35,7 @@ struct impl_data {
std::unique_ptr<float *[]> play_buffer, rec_buffer, out_buffer;
};
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.eac.webrtc");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.eac.webrtc");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
@ -391,6 +391,10 @@ static const struct spa_handle_factory spa_aec_webrtc_factory = {
impl_enum_interface_info,
};
extern "C" {
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
}
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)
{

4
spa/plugins/alsa/alsa.c
View file

@ -22,7 +22,9 @@ extern const struct spa_handle_factory spa_alsa_compress_offload_sink_factory;
extern const struct spa_handle_factory spa_alsa_compress_offload_device_factory;
#endif
struct spa_log_topic alsa_log_topic = SPA_LOG_TOPIC(0, "spa.alsa");
SPA_LOG_TOPIC_DEFINE(alsa_log_topic, "spa.alsa");
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)

2
spa/plugins/audioconvert/audioadapter.c
View file

@ -27,7 +27,7 @@
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.audioadapter");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.audioadapter");
#define DEFAULT_ALIGN 16

2
spa/plugins/audioconvert/audioconvert.c
View file

@ -37,7 +37,7 @@
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.audioconvert");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.audioconvert");
#define DEFAULT_RATE 48000
#define DEFAULT_CHANNELS 2

3
spa/plugins/audioconvert/plugin.c
View file

@ -5,10 +5,13 @@
#include <errno.h>
#include <spa/support/plugin.h>
#include <spa/support/log.h>
extern const struct spa_handle_factory spa_audioconvert_factory;
extern const struct spa_handle_factory spa_audioadapter_factory;
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)
{

2
spa/plugins/audiomixer/audiomixer.c
View file

@ -24,7 +24,7 @@
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.audiomixer");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.audiomixer");
#define DEFAULT_RATE 48000
#define DEFAULT_CHANNELS 2

2
spa/plugins/audiomixer/mixer-dsp.c
View file

@ -24,7 +24,7 @@
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.mixer-dsp");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.mixer-dsp");
#define MAX_BUFFERS 64
#define MAX_PORTS 512

3
spa/plugins/audiomixer/plugin.c
View file

@ -5,10 +5,13 @@
#include <errno.h>
#include <spa/support/plugin.h>
#include <spa/support/log.h>
extern const struct spa_handle_factory spa_audiomixer_factory;
extern const struct spa_handle_factory spa_mixer_dsp_factory;
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)
{

4
spa/plugins/avb/avb.c
View file

@ -12,7 +12,9 @@
extern const struct spa_handle_factory spa_avb_sink_factory;
extern const struct spa_handle_factory spa_avb_source_factory;
struct spa_log_topic avb_log_topic = SPA_LOG_TOPIC(0, "spa.avb");
SPA_LOG_TOPIC_DEFINE(avb_log_topic, "spa.avb");
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)

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

@ -17,9 +17,6 @@
#include "media-codecs.h"
static struct spa_log *log;
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.codecs.aac");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
#define DEFAULT_AAC_BITRATE 320000
#define MIN_AAC_BITRATE 64000
@ -608,7 +605,7 @@ static int codec_increase_bitpool(void *data)
static void codec_set_log(struct spa_log *global_log)
{
log = global_log;
spa_log_topic_init(log, &log_topic);
spa_log_topic_init(log, &codec_plugin_log_topic);
}
const struct media_codec a2dp_codec_aac = {

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

@ -27,9 +27,6 @@
#include "media-codecs.h"
static struct spa_log *log;
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.codecs.opus");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
#define BUFSIZE_FROM_BITRATE(frame_dms,bitrate) ((bitrate)/8 * (frame_dms) / 10000 * 5/4) /* estimate */
@ -1333,7 +1330,7 @@ static int codec_increase_bitpool(void *data)
static void codec_set_log(struct spa_log *global_log)
{
log = global_log;
spa_log_topic_init(log, &log_topic);
spa_log_topic_init(log, &codec_plugin_log_topic);
}
#define OPUS_05_COMMON_DEFS \

2
spa/plugins/bluez5/backend-hsphfpd.c
View file

@ -20,7 +20,7 @@
#include "defs.h"
#include "dbus-helpers.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.hsphfpd");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.hsphfpd");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/backend-native.c
View file

@ -37,7 +37,7 @@
#include "modemmanager.h"
#include "upower.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.native");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.native");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/backend-ofono.c
View file

@ -27,7 +27,7 @@
#define INITIAL_INTERVAL_NSEC (500 * SPA_NSEC_PER_MSEC)
#define ACTION_INTERVAL_NSEC (3000 * SPA_NSEC_PER_MSEC)
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.ofono");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.ofono");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

5
spa/plugins/bluez5/bap-codec-lc3.c
View file

@ -24,9 +24,6 @@
#define MAX_PACS 64
static struct spa_log *log;
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.codecs.lc3");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
struct impl {
lc3_encoder_t enc[LC3_MAX_CHANNELS];
@ -978,7 +975,7 @@ static int codec_increase_bitpool(void *data)
static void codec_set_log(struct spa_log *global_log)
{
log = global_log;
spa_log_topic_init(log, &log_topic);
spa_log_topic_init(log, &codec_plugin_log_topic);
}
const struct media_codec bap_codec_lc3 = {

2
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -41,7 +41,7 @@
#include "bap-codec-caps.h"
#include "defs.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/bluez5-device.c
View file

@ -34,7 +34,7 @@
#include "defs.h"
#include "media-codecs.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.device");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.device");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/codec-loader.c
View file

@ -15,7 +15,7 @@
#define MAX_CODECS 0x3E
#define MAX_HANDLES MAX_CODECS
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.codecs");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.codecs");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/iso-io.c
View file

@ -22,7 +22,7 @@
#include "media-codecs.h"
#include "defs.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.iso");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.iso");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/media-codecs.c
View file

@ -175,6 +175,8 @@ impl_enum_interface_info(const struct spa_handle_factory *factory,
return 1;
}
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
static const struct spa_dict_item handle_info_items[] = {
{ SPA_KEY_FACTORY_DESCRIPTION, "Bluetooth codec plugin" },
};

6
spa/plugins/bluez5/media-codecs.h
View file

@ -39,10 +39,14 @@ struct spa_bluez5_codec_a2dp {
#define MEDIA_CODEC_EXPORT_DEF(basename,...) \
const char *codec_plugin_factory_name = MEDIA_CODEC_FACTORY_NAME(basename); \
static const struct media_codec * const codec_plugin_media_codec_list[] = { __VA_ARGS__, NULL }; \
const struct media_codec * const * const codec_plugin_media_codecs = codec_plugin_media_codec_list;
const struct media_codec * const * const codec_plugin_media_codecs = codec_plugin_media_codec_list; \
SPA_LOG_TOPIC_DEFINE(codec_plugin_log_topic, "spa.bluez5.codecs." basename);
extern const struct media_codec * const * const codec_plugin_media_codecs;
extern const char *codec_plugin_factory_name;
extern struct spa_log_topic codec_plugin_log_topic;
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &codec_plugin_log_topic
#endif
#define MEDIA_CODEC_FLAG_SINK (1 << 0)

2
spa/plugins/bluez5/media-sink.c
View file

@ -41,7 +41,7 @@
#include "rate-control.h"
#include "iso-io.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.sink.media");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.sink.media");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/media-source.c
View file

@ -36,7 +36,7 @@
#include "rtp.h"
#include "media-codecs.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.source.media");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.source.media");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/midi-enum.c
View file

@ -29,7 +29,7 @@
#define MIDI_OBJECT_PATH "/midi"
#define MIDI_PROFILE_PATH MIDI_OBJECT_PATH "/profile"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.midi");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.midi");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/midi-node.c
View file

@ -41,7 +41,7 @@
#include "bluez5-interface-gen.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.midi.node");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.midi.node");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/player.c
View file

@ -50,7 +50,7 @@
" </interface>" \
"</node>"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.player");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.player");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

3
spa/plugins/bluez5/plugin.c
View file

@ -6,6 +6,7 @@
#include <stdio.h>
#include <spa/support/plugin.h>
#include <spa/support/log.h>
extern const struct spa_handle_factory spa_bluez5_dbus_factory;
extern const struct spa_handle_factory spa_bluez5_device_factory;
@ -18,6 +19,8 @@ extern const struct spa_handle_factory spa_a2dp_source_factory;
extern const struct spa_handle_factory spa_bluez5_midi_enum_factory;
extern const struct spa_handle_factory spa_bluez5_midi_node_factory;
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)
{

2
spa/plugins/bluez5/quirks.c
View file

@ -39,7 +39,7 @@
#include "defs.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.quirks");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.quirks");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/sco-sink.c
View file

@ -33,7 +33,7 @@
#include "defs.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.sink.sco");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.sink.sco");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

2
spa/plugins/bluez5/sco-source.c
View file

@ -35,7 +35,7 @@
#include "defs.h"
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.bluez5.source.sco");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.source.sco");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

4
spa/plugins/libcamera/libcamera.c
View file

@ -9,7 +9,9 @@
#include "libcamera.h"
struct spa_log_topic libcamera_log_topic = SPA_LOG_TOPIC(0, "spa.libcamera");
SPA_LOG_TOPIC_DEFINE(libcamera_log_topic, "spa.libcamera");
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory,

3
spa/plugins/support/cpu.c
View file

@ -22,7 +22,8 @@
#include <spa/utils/names.h>
#include <spa/utils/string.h>
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.cpu");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.cpu");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

3
spa/plugins/support/dbus.c
View file

@ -20,7 +20,8 @@
#include <spa/support/plugin.h>
#include <spa/support/dbus.h>
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.dbus");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.dbus");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

4
spa/plugins/support/loop.c
View file

@ -22,10 +22,12 @@
#include <spa/utils/ringbuffer.h>
#include <spa/utils/string.h>
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.loop");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.loop");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
#define MAX_ALIGN 8
#define ITEM_ALIGN 8
#define DATAS_SIZE (4096*8)

3
spa/plugins/support/plugin.c
View file

@ -6,6 +6,7 @@
#include <stdio.h>
#include <spa/support/plugin.h>
#include <spa/support/log.h>
extern const struct spa_handle_factory spa_support_logger_factory;
extern const struct spa_handle_factory spa_support_system_factory;
@ -14,6 +15,8 @@ extern const struct spa_handle_factory spa_support_loop_factory;
extern const struct spa_handle_factory spa_support_node_driver_factory;
extern const struct spa_handle_factory spa_support_null_audio_sink_factory;
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)
{

3
spa/plugins/support/system.c
View file

@ -21,7 +21,8 @@
#include <spa/utils/names.h>
#include <spa/utils/string.h>
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.system");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.system");
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic

4
spa/plugins/v4l2/v4l2.c
View file

@ -13,7 +13,9 @@ extern const struct spa_handle_factory spa_v4l2_source_factory;
extern const struct spa_handle_factory spa_v4l2_udev_factory;
extern const struct spa_handle_factory spa_v4l2_device_factory;
struct spa_log_topic v4l2_log_topic = SPA_LOG_TOPIC(0, "spa.v4l2");
SPA_LOG_TOPIC_DEFINE(v4l2_log_topic, "spa.v4l2");
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory,

3
spa/plugins/videoconvert/plugin.c
View file

@ -5,9 +5,12 @@
#include <errno.h>
#include <spa/support/plugin.h>
#include <spa/support/log.h>
extern const struct spa_handle_factory spa_videoadapter_factory;
SPA_LOG_TOPIC_ENUM_DEFINE_REGISTERED;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)
{

2
spa/plugins/videoconvert/videoadapter.c
View file

@ -26,7 +26,7 @@
#undef SPA_LOG_TOPIC_DEFAULT
#define SPA_LOG_TOPIC_DEFAULT &log_topic
static struct spa_log_topic log_topic = SPA_LOG_TOPIC(0, "spa.videoadapter");
SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.videoadapter");
#define DEFAULT_ALIGN 16