mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-15 07:00:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove spalib

Browse source
This commit is contained in:
Wim Taymans 2018-08-14 12:33:53 +02:00
parent d3b9a52ec4
commit 9d36b85dd6
49 changed files with 566 additions and 1162 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/examples/export-sink.c
View file

@ -28,7 +28,7 @@
#include <spa/param/video/format-utils.h>
#include <spa/param/props.h>
#include <spa/node/io.h>
#include <spa/lib/debug.h>
#include <spa/debug/format.h>
#include <pipewire/pipewire.h>
#include <pipewire/module.h>
@ -445,7 +445,7 @@ static int port_set_format(struct spa_node *node,
if (format == NULL)
return 0;
spa_debug_pod(format, SPA_DEBUG_FLAG_FORMAT);
spa_debug_format(0, d->t->map, format);
spa_format_video_raw_parse(format, &d->format, &d->type.format_video);
@ -656,8 +656,6 @@ int main(int argc, char *argv[])
init_type(&data.type, data.t->map);
reset_props(&data.props);
spa_debug_set_type_map(data.t->map);
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
printf("can't initialize SDL: %s\n", SDL_GetError());
return -1;

5
src/examples/export-source.c
View file

@ -27,7 +27,7 @@
#include <spa/param/audio/format-utils.h>
#include <spa/param/props.h>
#include <spa/node/io.h>
#include <spa/lib/debug.h>
#include <spa/debug/format.h>
#include <pipewire/pipewire.h>
@ -351,7 +351,7 @@ static int port_set_format(struct spa_node *node,
return 0;
}
spa_debug_pod(format, SPA_DEBUG_FLAG_FORMAT);
spa_debug_format(0, d->t->map, format);
if (spa_format_audio_raw_parse(format, &d->format, &d->type.format_audio) < 0)
return -EINVAL;
@ -592,7 +592,6 @@ int main(int argc, char *argv[])
spa_list_init(&data.empty);
init_type(&data.type, data.t->map);
reset_props(&data.props);
spa_debug_set_type_map(data.t->map);
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);

2
src/examples/export-spa.c
View file

@ -140,8 +140,6 @@ int main(int argc, char *argv[])
pw_module_load(data.core, "libpipewire-module-spa-node-factory", NULL, NULL, NULL, NULL);
spa_debug_set_type_map(data.t->map);
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);
pw_remote_connect(data.remote);

6
src/examples/local-v4l2.c
View file

@ -27,7 +27,7 @@
#include <spa/param/video/format-utils.h>
#include <spa/param/props.h>
#include <spa/node/io.h>
#include <spa/lib/debug.h>
#include <spa/debug/format.h>
#include <pipewire/pipewire.h>
#include <pipewire/module.h>
@ -337,7 +337,7 @@ static int port_set_format(struct spa_node *node, enum spa_direction direction,
if (format == NULL)
return 0;
spa_debug_pod(format, SPA_DEBUG_FLAG_FORMAT);
spa_debug_format(0, d->t->map, format);
spa_format_video_raw_parse(format, &d->format, &d->type.format_video);
@ -511,8 +511,6 @@ int main(int argc, char *argv[])
init_type(&data.type, data.t->map);
spa_debug_set_type_map(data.t->map);
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
printf("can't initialize SDL: %s\n", SDL_GetError());
return -1;

6
src/examples/video-play.c
View file

@ -27,7 +27,7 @@
#include <spa/param/format-utils.h>
#include <spa/param/video/format-utils.h>
#include <spa/param/props.h>
#include <spa/lib/debug.h>
#include <spa/debug/format.h>
#include <pipewire/pipewire.h>
@ -343,7 +343,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
params[0] = spa_pod_builder_pop(&b);
printf("supported formats:\n");
spa_debug_pod(params[0], SPA_DEBUG_FLAG_FORMAT);
spa_debug_format(2, data->t->map, params[0]);
pw_stream_add_listener(data->stream,
&data->stream_listener,
@ -426,8 +426,6 @@ int main(int argc, char *argv[])
init_type(&data.type, data.t->map);
spa_debug_set_type_map(data.t->map);
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
printf("can't initialize SDL: %s\n", SDL_GetError());
return -1;

2
src/modules/meson.build
View file

@ -66,7 +66,6 @@ pipewire_module_link_factory = shared_library('pipewire-module-link-factory',
#pipewire_module_protocol_dbus = shared_library('pipewire-module-protocol-dbus', [ 'module-protocol-dbus.c', gdbus_target ],
# c_args : pipewire_module_c_args,
# include_directories : [configinc, spa_inc],
# link_with : spalib,
# install : true,
# install_dir : modules_install_dir,
# dependencies : [glib_dep, gio_dep, mathlib, dl_lib, pipewire_dep],
@ -80,7 +79,6 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ
'module-protocol-native/connection.c' ],
c_args : pipewire_module_c_args,
include_directories : [configinc, spa_inc],
link_with : spalib,
install : true,
install_dir : modules_install_dir,
dependencies : [mathlib, dl_lib, pipewire_dep],

10
src/modules/module-protocol-native.c
View file

@ -28,7 +28,7 @@
#include <sys/file.h>
#include <spa/pod/iter.h>
#include <spa/lib/debug.h>
#include <spa/debug/pod.h>
#include "config.h"
@ -227,7 +227,7 @@ process_messages(struct client_data *data)
if (debug_messages) {
printf("<<<<<<<<< in: %d %d %d\n", id, opcode, size);
spa_debug_pod((struct spa_pod *)message, 0);
spa_debug_pod(0, core->type.map, (struct spa_pod *)message);
}
if (demarshal[opcode].func(resource, message, size) < 0)
goto invalid_message;
@ -338,7 +338,7 @@ static struct pw_client *client_new(struct server *s, int fd)
if (this->source == NULL)
goto no_source;
this->connection = pw_protocol_native_connection_new(fd);
this->connection = pw_protocol_native_connection_new(protocol->core, fd);
if (this->connection == NULL)
goto no_connection;
@ -561,7 +561,7 @@ on_remote_data(void *data, int fd, enum spa_io mask)
}
if (debug_messages) {
printf("<<<<<<<<< in: %d %d %d\n", id, opcode, size);
spa_debug_pod((struct spa_pod *)message, 0);
spa_debug_pod(0, core->type.map, (struct spa_pod *)message);
}
if (demarshal[opcode].func(proxy, message, size) < 0) {
pw_log_error ("protocol-native %p: invalid message received %u for %u", this,
@ -605,7 +605,7 @@ static int impl_connect_fd(struct pw_protocol_client *client, int fd)
impl->disconnecting = false;
impl->connection = pw_protocol_native_connection_new(fd);
impl->connection = pw_protocol_native_connection_new(remote->core, fd);
if (impl->connection == NULL)
goto error_close;

9
src/modules/module-protocol-native/connection.c
View file

@ -25,7 +25,7 @@
#include <unistd.h>
#include <sys/socket.h>
#include <spa/lib/debug.h>
#include <spa/debug/pod.h>
#include <pipewire/pipewire.h>
#include <pipewire/private.h>
@ -59,6 +59,8 @@ struct impl {
uint32_t dest_id;
uint8_t opcode;
struct spa_pod_builder builder;
struct pw_core *core;
};
/** \endcond */
@ -193,7 +195,7 @@ static void clear_buffer(struct buffer *buf)
*
* \memberof pw_protocol_native_connection
*/
struct pw_protocol_native_connection *pw_protocol_native_connection_new(int fd)
struct pw_protocol_native_connection *pw_protocol_native_connection_new(struct pw_core *core, int fd)
{
struct impl *impl;
struct pw_protocol_native_connection *this;
@ -216,6 +218,7 @@ struct pw_protocol_native_connection *pw_protocol_native_connection_new(int fd)
impl->in.buffer_data = malloc(MAX_BUFFER_SIZE);
impl->in.buffer_maxsize = MAX_BUFFER_SIZE;
impl->in.update = true;
impl->core = core;
if (impl->out.buffer_data == NULL || impl->in.buffer_data == NULL)
goto no_mem;
@ -432,7 +435,7 @@ pw_protocol_native_connection_end(struct pw_protocol_native_connection *conn,
if (debug_messages) {
printf(">>>>>>>>> out: %d %d %d\n", impl->dest_id, impl->opcode, size);
spa_debug_pod((struct spa_pod *)p, 0);
spa_debug_pod(0, impl->core->type.map, (struct spa_pod *)p);
}
spa_hook_list_call(&conn->listener_list, struct pw_protocol_native_connection_events, need_flush);
}

2
src/modules/module-protocol-native/connection.h
View file

@ -59,7 +59,7 @@ pw_protocol_native_connection_add_listener(struct pw_protocol_native_connection
}
struct pw_protocol_native_connection *
pw_protocol_native_connection_new(int fd);
pw_protocol_native_connection_new(struct pw_core *core, int fd);
void
pw_protocol_native_connection_destroy(struct pw_protocol_native_connection *conn);

12
src/pipewire/core.c
View file

@ -21,10 +21,10 @@
#include <time.h>
#include <stdio.h>
#define spa_debug pw_log_trace
#include <pipewire/log.h>
#include <spa/lib/debug.h>
#include <spa/support/dbus.h>
#include <spa/debug/format.h>
#include <pipewire/pipewire.h>
#include <pipewire/private.h>
@ -33,6 +33,8 @@
#include <pipewire/core.h>
#include <pipewire/data-loop.h>
#undef spa_debug
#define spa_debug pw_log_trace
#include <spa/graph/graph-scheduler6.h>
/** \cond */
@ -389,8 +391,6 @@ struct pw_core *pw_core_new(struct pw_loop *main_loop, struct pw_properties *pro
spa_graph_init(&this->rt.graph);
spa_graph_set_callbacks(&this->rt.graph, &spa_graph_impl_default, NULL);
spa_debug_set_type_map(this->type.map);
this->support[0] = SPA_SUPPORT_INIT(SPA_TYPE__TypeMap, this->type.map);
this->support[1] = SPA_SUPPORT_INIT(SPA_TYPE_LOOP__DataLoop, this->data_loop->loop);
this->support[2] = SPA_SUPPORT_INIT(SPA_TYPE_LOOP__MainLoop, this->main_loop->loop);
@ -784,7 +784,7 @@ int pw_core_find_format(struct pw_core *core,
}
pw_log_debug("enum output %d with filter: %p", oidx, filter);
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_pod(filter, SPA_DEBUG_FLAG_FORMAT);
spa_debug_format(2, core->type.map, filter);
if ((res = spa_node_port_enum_params(output->node->node,
output->direction, output->port_id,
@ -800,7 +800,7 @@ int pw_core_find_format(struct pw_core *core,
pw_log_debug("Got filtered:");
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_pod(*format, SPA_DEBUG_FLAG_FORMAT);
spa_debug_format(2, core->type.map, *format);
} else {
res = -EBADF;
asprintf(error, "error node state");

18
src/pipewire/link.c
View file

@ -24,11 +24,11 @@
#include <spa/pod/parser.h>
#include <spa/pod/compare.h>
#include <spa/param/param.h>
#include <spa/debug/node.h>
#include <spa/debug/format.h>
#include <spa/lib/debug.h>
#include "pipewire.h"
#include "private.h"
#include "pipewire.h"
#include "interfaces.h"
#include "link.h"
#include "work-queue.h"
@ -186,7 +186,7 @@ static int do_negotiate(struct pw_link *this, uint32_t in_state, uint32_t out_st
pw_log_debug("link %p: doing set format %p", this, format);
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_pod(format, SPA_DEBUG_FLAG_FORMAT);
spa_debug_format(2, t->map, format);
if (out_state == PW_PORT_STATE_CONFIGURE) {
pw_log_debug("link %p: doing set format on output", this);
@ -459,7 +459,7 @@ param_filter(struct pw_link *this,
}
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG) && iparam != NULL)
spa_debug_pod(iparam, 0);
spa_debug_pod(2, this->core->type.map, iparam);
for (oidx = 0;;) {
pw_log_debug("oparam %d", oidx);
@ -470,7 +470,7 @@ param_filter(struct pw_link *this,
}
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_pod(oparam, 0);
spa_debug_pod(2, this->core->type.map, oparam);
num++;
}
@ -555,8 +555,8 @@ static int do_allocation(struct pw_link *this, uint32_t in_state, uint32_t out_s
}
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG)) {
spa_debug_port_info(oinfo);
spa_debug_port_info(iinfo);
spa_debug_port_info(2, oinfo);
spa_debug_port_info(2, iinfo);
}
if (output->allocation.n_buffers) {
out_flags = 0;
@ -593,7 +593,7 @@ static int do_allocation(struct pw_link *this, uint32_t in_state, uint32_t out_s
spa_pod_fixate(params[i]);
pw_log_debug("fixated param %d:", i);
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_pod(params[i], 0);
spa_debug_pod(2, this->core->type.map, params[i]);
offset += SPA_ROUND_UP_N(SPA_POD_SIZE(params[i]), 8);
}

4
src/pipewire/log.h
View file

@ -65,8 +65,10 @@ pw_log_logv(enum spa_log_level level,
(defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
#define pw_log_logc(lev,...) \
({ \
if (SPA_UNLIKELY(pw_log_level_enabled (lev))) \
pw_log_log(lev,__VA_ARGS__)
pw_log_log(lev,__VA_ARGS__); \
})
#define pw_log_error(...) pw_log_logc(SPA_LOG_LEVEL_ERROR,__FILE__,__LINE__,__func__,__VA_ARGS__)
#define pw_log_warn(...) pw_log_logc(SPA_LOG_LEVEL_WARN,__FILE__,__LINE__,__func__,__VA_ARGS__)

3
src/pipewire/meson.build
View file

@ -79,12 +79,11 @@ libpipewire = shared_library('pipewire-@0@'.format(apiversion), pipewire_sources
soversion : soversion,
c_args : libpipewire_c_args,
include_directories : [pipewire_inc, configinc, spa_inc],
link_with : spalib,
install : true,
dependencies : [dl_lib, mathlib, pthread_lib],
)
pipewire_dep = declare_dependency(link_with : libpipewire,
include_directories : [pipewire_inc, configinc, spa_inc],
dependencies : [pthread_lib,spalib_dep],
dependencies : [pthread_lib],
)

16
src/tools/pipewire-cli.c
View file

@ -25,7 +25,7 @@
#include <signal.h>
#include <string.h>
#include <spa/lib/debug.h>
#include <spa/debug/format.h>
#include <pipewire/pipewire.h>
#include <pipewire/command.h>
@ -596,7 +596,7 @@ static void info_link(struct proxy_data *pd)
fprintf(stdout, "%c\tinput-port-id: %u\n", MARK_CHANGE(1), info->input_port_id);
fprintf(stdout, "%c\tformat:\n", MARK_CHANGE(2));
if (info->format)
spa_debug_pod(info->format, SPA_DEBUG_FLAG_FORMAT);
spa_debug_format(2, pd->rd->data->t->map, info->format);
else
fprintf(stdout, "\t\tnone\n");
print_properties(info->props, MARK_CHANGE(3), true);
@ -666,14 +666,14 @@ static void node_event_param(void *object, uint32_t id, uint32_t index, uint32_t
struct proxy_data *data = object;
struct remote_data *rd = data->rd;
struct pw_type *t = rd->data->t;
uint32_t flags = 0;
fprintf(stdout, "remote %d node %d param %d index %d\n",
rd->id, data->global->id, id, index);
if (spa_pod_is_object_type(param, t->spa_format))
flags |= SPA_DEBUG_FLAG_FORMAT;
spa_debug_pod(param, flags);
spa_debug_format(2, t->map, param);
else
spa_debug_pod(2, t->map, param);
}
static const struct pw_node_proxy_events node_events = {
@ -704,14 +704,14 @@ static void port_event_param(void *object, uint32_t id, uint32_t index, uint32_t
struct proxy_data *data = object;
struct remote_data *rd = data->rd;
struct pw_type *t = rd->data->t;
uint32_t flags = 0;
fprintf(stdout, "remote %d port %d param %d index %d\n",
rd->id, data->global->id, id, index);
if (spa_pod_is_object_type(param, t->spa_format))
flags |= SPA_DEBUG_FLAG_FORMAT;
spa_debug_pod(param, flags);
spa_debug_format(2, t->map, param);
else
spa_debug_pod(2, t->map, param);
}
static const struct pw_port_proxy_events port_events = {

17
src/tools/pipewire-monitor.c
View file

@ -20,7 +20,7 @@
#include <stdio.h>
#include <signal.h>
#include <spa/lib/debug.h>
#include <spa/debug/format.h>
#include <pipewire/pipewire.h>
#include <pipewire/interfaces.h>
@ -216,10 +216,10 @@ static void print_node(struct proxy_data *data)
printf("%c\tname: \"%s\"\n", MARK_CHANGE(0), info->name);
printf("%c\tparams:\n", MARK_CHANGE(5));
for (i = 0; i < data->n_params; i++) {
uint32_t flags = 0;
if (spa_pod_is_object_type(data->params[i], t->spa_format))
flags |= SPA_DEBUG_FLAG_FORMAT;
spa_debug_pod(data->params[i], flags);
spa_debug_format(2, t->map, data->params[i]);
else
spa_debug_pod(2, t->map, data->params[i]);
}
printf("%c\tinput ports: %u/%u\n", MARK_CHANGE(1),
info->n_input_ports, info->max_input_ports);
@ -293,10 +293,10 @@ static void print_port(struct proxy_data *data)
printf("%c\tname: \"%s\"\n", MARK_CHANGE(0), info->name);
printf("%c\tparams:\n", MARK_CHANGE(2));
for (i = 0; i < data->n_params; i++) {
uint32_t flags = 0;
if (spa_pod_is_object_type(data->params[i], t->spa_format))
flags |= SPA_DEBUG_FLAG_FORMAT;
spa_debug_pod(data->params[i], flags);
spa_debug_format(2, t->map, data->params[i]);
else
spa_debug_pod(2, t->map, data->params[i]);
}
print_properties(info->props, MARK_CHANGE(1));
}
@ -404,6 +404,7 @@ static const struct pw_client_proxy_events client_events = {
static void link_event_info(void *object, struct pw_link_info *info)
{
struct proxy_data *data = object;
struct pw_type *t = pw_core_get_type(data->data->core);
bool print_all, print_mark;
print_all = true;
@ -431,7 +432,7 @@ static void link_event_info(void *object, struct pw_link_info *info)
printf("%c\tinput-port-id: %u\n", MARK_CHANGE(1), info->input_port_id);
printf("%c\tformat:\n", MARK_CHANGE(2));
if (info->format)
spa_debug_pod(info->format, SPA_DEBUG_FLAG_FORMAT);
spa_debug_format(2, t->map, info->format);
else
printf("\t\tnone\n");
print_properties(info->props, MARK_CHANGE(3));