mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

node: improve callbacks

Browse source 
Make separate callbacks for events and RT notifications.
This commit is contained in:
Wim Taymans 2017-05-11 10:29:20 +02:00
parent fb0919b8b7
commit 3b33e3d362
32 changed files with 557 additions and 481 deletions
Download patch file Download diff file Expand all files Collapse all files

27
spa/plugins/ffmpeg/ffmpeg-dec.c
View file

@ -76,7 +76,7 @@ struct _SpaFFMpegDec {
SpaTypeMap *map;
SpaLog *log;
SpaEventNodeCallback event_cb;
SpaNodeCallbacks callbacks;
void *user_data;
SpaFFMpegPort in_ports[1];
@ -127,9 +127,10 @@ spa_ffmpeg_dec_node_send_command (SpaNode *node,
}
static SpaResult
spa_ffmpeg_dec_node_set_event_callback (SpaNode *node,
SpaEventNodeCallback event,
void *user_data)
spa_ffmpeg_dec_node_set_callbacks (SpaNode *node,
const SpaNodeCallbacks *callbacks,
size_t callbacks_size,
void *user_data)
{
SpaFFMpegDec *this;
@ -138,7 +139,7 @@ spa_ffmpeg_dec_node_set_event_callback (SpaNode *node,
this = SPA_CONTAINER_OF (node, SpaFFMpegDec, node);
this->event_cb = event;
this->callbacks = *callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
@ -231,11 +232,11 @@ spa_ffmpeg_dec_node_port_enum_formats (SpaNode *node,
}
static SpaResult
spa_ffmpeg_dec_node_port_set_format (SpaNode *node,
SpaDirection direction,
uint32_t port_id,
SpaPortFormatFlags flags,
const SpaFormat *format)
spa_ffmpeg_dec_node_port_set_format (SpaNode *node,
SpaDirection direction,
uint32_t port_id,
uint32_t flags,
const SpaFormat *format)
{
SpaFFMpegDec *this;
SpaFFMpegPort *port;
@ -453,7 +454,7 @@ static const SpaNode ffmpeg_dec_node = {
spa_ffmpeg_dec_node_get_props,
spa_ffmpeg_dec_node_set_props,
spa_ffmpeg_dec_node_send_command,
spa_ffmpeg_dec_node_set_event_callback,
spa_ffmpeg_dec_node_set_callbacks,
spa_ffmpeg_dec_node_get_n_ports,
spa_ffmpeg_dec_node_get_port_ids,
spa_ffmpeg_dec_node_add_port,
@ -520,8 +521,8 @@ spa_ffmpeg_dec_init (SpaHandle *handle,
this->node = ffmpeg_dec_node;
this->in_ports[0].info.flags = SPA_PORT_INFO_FLAG_NONE;
this->out_ports[0].info.flags = SPA_PORT_INFO_FLAG_NONE;
this->in_ports[0].info.flags = 0;
this->out_ports[0].info.flags = 0;
return SPA_RESULT_OK;
}

27
spa/plugins/ffmpeg/ffmpeg-enc.c
View file

@ -81,7 +81,7 @@ struct _SpaFFMpegEnc {
SpaTypeMap *map;
SpaLog *log;
SpaEventNodeCallback event_cb;
SpaNodeCallbacks callbacks;
void *user_data;
SpaFFMpegPort in_ports[1];
@ -128,9 +128,10 @@ spa_ffmpeg_enc_node_send_command (SpaNode *node,
}
static SpaResult
spa_ffmpeg_enc_node_set_event_callback (SpaNode *node,
SpaEventNodeCallback event,
void *user_data)
spa_ffmpeg_enc_node_set_callbacks (SpaNode *node,
const SpaNodeCallbacks *callbacks,
size_t callbacks_size,
void *user_data)
{
SpaFFMpegEnc *this;
@ -139,7 +140,7 @@ spa_ffmpeg_enc_node_set_event_callback (SpaNode *node,
this = SPA_CONTAINER_OF (node, SpaFFMpegEnc, node);
this->event_cb = event;
this->callbacks = *callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
@ -235,11 +236,11 @@ spa_ffmpeg_enc_node_port_enum_formats (SpaNode *node,
}
static SpaResult
spa_ffmpeg_enc_node_port_set_format (SpaNode *node,
SpaDirection direction,
uint32_t port_id,
SpaPortFormatFlags flags,
const SpaFormat *format)
spa_ffmpeg_enc_node_port_set_format (SpaNode *node,
SpaDirection direction,
uint32_t port_id,
uint32_t flags,
const SpaFormat *format)
{
SpaFFMpegEnc *this;
SpaFFMpegPort *port;
@ -456,7 +457,7 @@ static const SpaNode ffmpeg_enc_node = {
spa_ffmpeg_enc_node_get_props,
spa_ffmpeg_enc_node_set_props,
spa_ffmpeg_enc_node_send_command,
spa_ffmpeg_enc_node_set_event_callback,
spa_ffmpeg_enc_node_set_callbacks,
spa_ffmpeg_enc_node_get_n_ports,
spa_ffmpeg_enc_node_get_port_ids,
spa_ffmpeg_enc_node_add_port,
@ -522,8 +523,8 @@ spa_ffmpeg_enc_init (SpaHandle *handle,
this->node = ffmpeg_enc_node;
this->in_ports[0].info.flags = SPA_PORT_INFO_FLAG_NONE;
this->out_ports[0].info.flags = SPA_PORT_INFO_FLAG_NONE;
this->in_ports[0].info.flags = 0;
this->out_ports[0].info.flags = 0;
return SPA_RESULT_OK;
}