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

connection: signal errors

Browse source
This commit is contained in:
Wim Taymans 2017-11-13 11:32:06 +01:00
parent 6fb0f580ea
commit 101d2af1be
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,11 @@ static void *connection_ensure_size(struct pw_protocol_native_connection *conn,
if (buf->buffer_size + size > buf->buffer_maxsize) { if (buf->buffer_size + size > buf->buffer_maxsize) {
buf->buffer_maxsize = SPA_ROUND_UP_N(buf->buffer_size + size, MAX_BUFFER_SIZE); buf->buffer_maxsize = SPA_ROUND_UP_N(buf->buffer_size + size, MAX_BUFFER_SIZE);
buf->buffer_data = realloc(buf->buffer_data, buf->buffer_maxsize); buf->buffer_data = realloc(buf->buffer_data, buf->buffer_maxsize);
if (buf->buffer_data == NULL) {
buf->buffer_maxsize = 0;
spa_hook_list_call(&conn->listener_list, struct pw_protocol_native_connection_events, error, -ENOMEM);
return NULL;
}
pw_log_warn("connection %p: resize buffer to %zd %zd %zd", pw_log_warn("connection %p: resize buffer to %zd %zd %zd",
conn, buf->buffer_size, size, buf->buffer_maxsize); conn, buf->buffer_size, size, buf->buffer_maxsize);
} }
@ -295,7 +299,8 @@ pw_protocol_native_connection_get_next(struct pw_protocol_native_connection *con
size -= buf->offset; size -= buf->offset;
if (size < 8) { if (size < 8) {
connection_ensure_size(conn, buf, 8); if (connection_ensure_size(conn, buf, 8) == NULL)
return false;
buf->update = true; buf->update = true;
goto again; goto again;
} }
@ -308,7 +313,8 @@ pw_protocol_native_connection_get_next(struct pw_protocol_native_connection *con
len = p[1] & 0xffffff; len = p[1] & 0xffffff;
if (len > size) { if (len > size) {
connection_ensure_size(conn, buf, len); if (connection_ensure_size(conn, buf, len) == NULL)
return false;
buf->update = true; buf->update = true;
goto again; goto again;
} }
@ -319,7 +325,6 @@ pw_protocol_native_connection_get_next(struct pw_protocol_native_connection *con
*dt = buf->data; *dt = buf->data;
*sz = buf->size; *sz = buf->size;
if (debug_messages) { if (debug_messages) {
printf("<<<<<<<<< in: %d %d %zd\n", *dest_id, *opcode, len); printf("<<<<<<<<< in: %d %d %zd\n", *dest_id, *opcode, len);
spa_debug_pod((struct spa_pod *)data, 0); spa_debug_pod((struct spa_pod *)data, 0);
@ -334,7 +339,9 @@ static inline void *begin_write(struct pw_protocol_native_connection *conn, uint
uint32_t *p; uint32_t *p;
struct buffer *buf = &impl->out; struct buffer *buf = &impl->out;
/* 4 for dest_id, 1 for opcode, 3 for size and size for payload */ /* 4 for dest_id, 1 for opcode, 3 for size and size for payload */
p = connection_ensure_size(conn, buf, 8 + size); if ((p = connection_ensure_size(conn, buf, 8 + size)) == NULL)
return NULL;
return p + 2; return p + 2;
} }
@ -420,7 +427,9 @@ pw_protocol_native_connection_end(struct pw_protocol_native_connection *conn,
uint32_t *p, size = builder->offset; uint32_t *p, size = builder->offset;
struct buffer *buf = &impl->out; struct buffer *buf = &impl->out;
p = connection_ensure_size(conn, buf, 8 + size); if ((p = connection_ensure_size(conn, buf, 8 + size)) == NULL)
return;
*p++ = impl->dest_id; *p++ = impl->dest_id;
*p++ = (impl->opcode << 24) | (size & 0xffffff); *p++ = (impl->opcode << 24) | (size & 0xffffff);

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

@ -31,6 +31,8 @@ struct pw_protocol_native_connection_events {
#define PW_VERSION_PROTOCOL_NATIVE_CONNECTION_EVENTS 0 #define PW_VERSION_PROTOCOL_NATIVE_CONNECTION_EVENTS 0
void (*destroy) (void *data); void (*destroy) (void *data);
void (*error) (void *data, int error);
void (*need_flush) (void *data); void (*need_flush) (void *data);
}; };