LADI
/
pipewire
1
Fork 0
Code Actions

videoconvert: beginnings of video converter

This commit is contained in:
Wim Taymans 2019-07-25 12:19:41 +02:00
parent 18776b155b
commit b314547702
7 changed files with 1183 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson_options.txt
View File

@ -74,6 +74,10 @@ option('v4l2',
description: 'Enable v4l2 spa plugin integration',
type: 'boolean',
value: true)
option('videoconvert',
description: 'Enable videoconvert spa plugin integration',
type: 'boolean',
value: true)
option('videotestsrc',
description: 'Enable videotestsrc spa plugin integration',
type: 'boolean',

11
spa/include/spa/utils/names.h
View File

@ -65,6 +65,17 @@ extern "C" {
#define SPA_NAME_AUDIO_ADAPT "audio.adapt" /**< combination of a node and an
* audio.convert. Does clock slaving */
/** video processing */
#define SPA_NAME_VIDEO_PROCESS_FORMAT "video.process.format" /**< processes raw video from one format
* to another */
#define SPA_NAME_VIDEO_PROCESS_SCALE "video.process.scale" /**< scales raw video */
/** video convert combines some of the video processing */
#define SPA_NAME_VIDEO_CONVERT "video.convert" /**< converts raw video from one format
* to another. Must include at least
* format and scaling */
#define SPA_NAME_VIDEO_ADAPT "video.adapt" /**< combination of a node and a
* video.convert. */
/** keys for alsa factory names */
#define SPA_NAME_API_ALSA_MONITOR "api.alsa.monitor" /**< an alsa Monitor interface */
#define SPA_NAME_API_ALSA_DEVICE "api.alsa.device" /**< an alsa Device interface */

3
spa/plugins/meson.build
View File

@ -22,6 +22,9 @@ endif
if get_option('test')
subdir('test')
endif
if get_option('videoconvert')
subdir('videoconvert')
endif
if get_option('videotestsrc')
subdir('videotestsrc')
endif

14
spa/plugins/videoconvert/meson.build Normal file
View File

@ -0,0 +1,14 @@
videoconvert_sources = ['videoadapter.c',
'plugin.c']
simd_cargs = []
simd_dependencies = []
videoconvertlib = shared_library('spa-videoconvert',
videoconvert_sources,
c_args : simd_cargs,
include_directories : [spa_inc],
dependencies : [ mathlib ],
link_with : simd_dependencies,
install : true,
install_dir : '@0@/spa/videoconvert/'.format(get_option('libdir')))

46
spa/plugins/videoconvert/plugin.c Normal file
View File

@ -0,0 +1,46 @@
/* Spa videoconvert plugin
*
* Copyright © 2018 Wim Taymans
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#include <errno.h>
#include <spa/support/plugin.h>
extern const struct spa_handle_factory spa_videoadapter_factory;
SPA_EXPORT
int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t *index)
{
spa_return_val_if_fail(factory != NULL, -EINVAL);
spa_return_val_if_fail(index != NULL, -EINVAL);
switch (*index) {
case 0:
*factory = &spa_videoadapter_factory;
break;
default:
return 0;
}
(*index)++;
return 1;
}

1004
spa/plugins/videoconvert/videoadapter.c Normal file
View File

File diff suppressed because it is too large Load Diff

143
src/modules/module-adapter/adapter.c
View File

@ -31,18 +31,20 @@
#include "config.h"
#include <spa/node/node.h>
#include <spa/node/utils.h>
#include <spa/utils/hook.h>
#include <spa/utils/names.h>
#include <spa/param/audio/format-utils.h>
#include <spa/utils/type-info.h>
#include <spa/param/audio/type-info.h>
#include <spa/param/format.h>
#include <spa/param/format-utils.h>
#include <spa/debug/types.h>
#include "pipewire/pipewire.h"
#include "pipewire/private.h"
#include "modules/spa/spa-node.h"
#define NAME "audioadapter"
#define NAME "adapter"
#define PORT_BUFFERS 1
#define MAX_BUFFER_SIZE 2048
@ -85,7 +87,8 @@ struct node {
enum pw_direction direction;
struct pw_properties *props;
struct spa_audio_info format;
uint32_t media_type;
uint32_t media_subtype;
struct spa_list ports;
};
@ -251,27 +254,29 @@ static void node_port_init(void *data, struct pw_port *port)
if (direction != n->direction)
return;
p = calloc(1, sizeof(struct port) +
if (n->media_type == SPA_MEDIA_TYPE_audio) {
p = calloc(1, sizeof(struct port) +
spa_handle_factory_get_size(&spa_floatmix_factory, NULL));
p->node = n;
p->port = port;
init_port(p, direction);
p->spa_handle = SPA_MEMBER(p, sizeof(struct port), struct spa_handle);
p->node = n;
p->port = port;
init_port(p, direction);
p->spa_handle = SPA_MEMBER(p, sizeof(struct port), struct spa_handle);
support = pw_core_get_support(n->core, &n_support);
spa_handle_factory_init(&spa_floatmix_factory,
p->spa_handle, NULL,
support, n_support);
support = pw_core_get_support(n->core, &n_support);
spa_handle_factory_init(&spa_floatmix_factory,
p->spa_handle, NULL,
support, n_support);
spa_handle_get_interface(p->spa_handle, SPA_TYPE_INTERFACE_Node, &iface);
p->spa_node = iface;
spa_handle_get_interface(p->spa_handle, SPA_TYPE_INTERFACE_Node, &iface);
p->spa_node = iface;
if (direction == PW_DIRECTION_INPUT) {
pw_log_debug("mix node %p", p->spa_node);
pw_port_set_mix(port, p->spa_node, PW_PORT_MIX_FLAG_MULTI);
port->impl = SPA_CALLBACKS_INIT(&port_implementation, p);
if (direction == PW_DIRECTION_INPUT) {
pw_log_debug("mix node %p", p->spa_node);
pw_port_set_mix(port, p->spa_node, PW_PORT_MIX_FLAG_MULTI);
port->impl = SPA_CALLBACKS_INIT(&port_implementation, p);
}
spa_list_append(&n->ports, &p->link);
}
spa_list_append(&n->ports, &p->link);
}
static const struct pw_node_events node_events = {
@ -281,6 +286,37 @@ static const struct pw_node_events node_events = {
.port_init = node_port_init,
};
static int find_format(struct pw_node *node, enum pw_direction direction,
uint32_t *media_type, uint32_t *media_subtype)
{
uint32_t state = 0;
uint8_t buffer[4096];
struct spa_pod_builder b;
int res;
struct spa_pod *format;
spa_pod_builder_init(&b, buffer, sizeof(buffer));
if ((res = spa_node_port_enum_params_sync(node->node,
direction == PW_DIRECTION_INPUT ?
SPA_DIRECTION_INPUT :
SPA_DIRECTION_OUTPUT, 0,
SPA_PARAM_EnumFormat, &state,
NULL, &format, &b)) != 1) {
pw_log_warn(NAME " %p: no format given", node);
return -ENOENT;
}
if ((res = spa_format_parse(format, media_type, media_subtype)) < 0)
return res;
pw_log_debug(NAME " %p: %s/%s", node,
spa_debug_type_find_name(spa_type_media_type, *media_type),
spa_debug_type_find_name(spa_type_media_subtype, *media_subtype));
return 0;
}
struct pw_node *pw_adapter_new(struct pw_core *core,
struct pw_node *slave,
struct pw_properties *props,
@ -288,23 +324,32 @@ struct pw_node *pw_adapter_new(struct pw_core *core,
{
struct pw_node *node;
struct node *n;
const char *name, *str;
const char *name, *str, *factory_name;
const struct pw_node_info *info;
enum pw_direction direction;
int res = -ENOENT;
int res;
uint32_t media_type, media_subtype;
info = pw_node_get_info(slave);
if (info == NULL) {
errno = EINVAL;
return NULL;
res = -EINVAL;
goto error;
}
pw_log_debug(NAME " %p: in %d/%d out %d/%d", slave,
info->n_input_ports, info->max_input_ports,
info->n_output_ports, info->max_output_ports);
pw_properties_update(props, info->props);
if (info->n_output_ports == 0)
direction = PW_DIRECTION_INPUT;
else
if (info->n_output_ports > 0) {
direction = PW_DIRECTION_OUTPUT;
} else if (info->n_input_ports > 0) {
direction = PW_DIRECTION_INPUT;
} else {
res = -EINVAL;
goto error;
}
if ((name = pw_properties_get(props, PW_KEY_NODE_NAME)) == NULL)
name = NAME;
@ -321,35 +366,49 @@ struct pw_node *pw_adapter_new(struct pw_core *core,
pw_properties_set(props, "factory.mode", str);
}
pw_properties_setf(props, "audio.adapt.slave", "pointer:%p", slave->node);
pw_properties_set(props, SPA_KEY_LIBRARY_NAME, "audioconvert/libspa-audioconvert");
if (pw_properties_get(props, PW_KEY_MEDIA_CLASS) == NULL)
pw_properties_setf(props, PW_KEY_MEDIA_CLASS, "Audio/%s",
direction == PW_DIRECTION_INPUT ? "Sink" : "Source");
if ((res = find_format(slave, direction, &media_type, &media_subtype)) < 0)
goto error;
if (media_type == SPA_MEDIA_TYPE_audio) {
pw_properties_setf(props, "audio.adapt.slave", "pointer:%p", slave->node);
pw_properties_set(props, SPA_KEY_LIBRARY_NAME, "audioconvert/libspa-audioconvert");
if (pw_properties_get(props, PW_KEY_MEDIA_CLASS) == NULL)
pw_properties_setf(props, PW_KEY_MEDIA_CLASS, "Audio/%s",
direction == PW_DIRECTION_INPUT ? "Sink" : "Source");
factory_name = SPA_NAME_AUDIO_ADAPT;
}
else if (media_type == SPA_MEDIA_TYPE_video) {
pw_properties_setf(props, "video.adapt.slave", "pointer:%p", slave->node);
pw_properties_set(props, SPA_KEY_LIBRARY_NAME, "videoconvert/libspa-videoconvert");
if (pw_properties_get(props, PW_KEY_MEDIA_CLASS) == NULL)
pw_properties_setf(props, PW_KEY_MEDIA_CLASS, "Video/%s",
direction == PW_DIRECTION_INPUT ? "Sink" : "Source");
factory_name = SPA_NAME_VIDEO_ADAPT;
} else {
res = -ENOTSUP;
goto error;
}
node = pw_spa_node_load(core, NULL, NULL,
SPA_NAME_AUDIO_ADAPT,
name,
PW_SPA_NODE_FLAG_ACTIVATE | PW_SPA_NODE_FLAG_NO_REGISTER,
pw_properties_copy(props),
sizeof(struct node) + user_data_size);
factory_name,
name,
PW_SPA_NODE_FLAG_ACTIVATE | PW_SPA_NODE_FLAG_NO_REGISTER,
pw_properties_copy(props),
sizeof(struct node) + user_data_size);
if (node == NULL) {
res = -errno;
pw_log_error("can't load spa node: %m");
goto error;
}
pw_log_debug(NAME " %p: in %d/%d out %d/%d", node,
info->n_input_ports, info->max_input_ports,
info->n_output_ports, info->max_output_ports);
n = pw_spa_node_get_user_data(node);
n->core = core;
n->node = node;
n->slave = slave;
n->direction = direction;
n->props = props;
n->media_type = media_type;
n->media_subtype = media_subtype;
spa_list_init(&n->ports);
if (user_data_size > 0)