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

plugins: just check the data pointer

Browse source 
We don't need to look at the data type, we just just be happy when
the data pointer is filled in.
This commit is contained in:
Wim Taymans 2019-10-16 12:23:42 +02:00
parent 8899d00bfc
commit c8ffcaaefe
20 changed files with 20 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/alsa/alsa-pcm-sink.c
View file

@ -544,7 +544,6 @@ impl_node_port_use_buffers(void *object,
for (i = 0; i < n_buffers; i++) {
struct buffer *b = &this->buffers[i];
struct spa_data *d = buffers[i]->datas;
uint32_t type;
b->buf = buffers[i];
b->id = i;
@ -552,10 +551,7 @@ impl_node_port_use_buffers(void *object,
b->h = spa_buffer_find_meta_data(b->buf, SPA_META_Header, sizeof(*b->h));
type = d[0].type;
if ((type == SPA_DATA_MemFd ||
type == SPA_DATA_DmaBuf ||
type == SPA_DATA_MemPtr) && d[0].data == NULL) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: need mapped memory", this);
return -EINVAL;
}

4
spa/plugins/alsa/alsa-pcm-source.c
View file

@ -564,9 +564,7 @@ impl_node_port_use_buffers(void *object,
b->h = spa_buffer_find_meta_data(b->buf, SPA_META_Header, sizeof(*b->h));
if (!((d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf ||
d[0].type == SPA_DATA_MemPtr) && d[0].data != NULL)) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: need mapped memory", this);
return -EINVAL;
}

4
spa/plugins/alsa/alsa-seq-source.c
View file

@ -726,9 +726,7 @@ impl_node_port_use_buffers(void *object,
b->h = spa_buffer_find_meta_data(b->buf, SPA_META_Header, sizeof(*b->h));
if (!((d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf ||
d[0].type == SPA_DATA_MemPtr) && d[0].data != NULL)) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: need mapped memory", this);
return -EINVAL;
}

4
spa/plugins/audioconvert/channelmix.c
View file

@ -748,9 +748,7 @@ impl_node_port_use_buffers(void *object,
else if (size != d[j].maxsize)
return -EINVAL;
if (!((d[j].type == SPA_DATA_MemPtr ||
d[j].type == SPA_DATA_MemFd ||
d[j].type == SPA_DATA_DmaBuf) && d[j].data != NULL)) {
if (d[j].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
buffers[i]);
return -EINVAL;

4
spa/plugins/audioconvert/fmtconvert.c
View file

@ -690,9 +690,7 @@ impl_node_port_use_buffers(void *object,
return -EINVAL;
}
if (!((d[j].type == SPA_DATA_MemPtr ||
d[j].type == SPA_DATA_MemFd ||
d[j].type == SPA_DATA_DmaBuf) && d[j].data != NULL)) {
if (d[j].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory %d on buffer %d",
this, j, i);
return -EINVAL;

4
spa/plugins/audioconvert/merger.c
View file

@ -789,9 +789,7 @@ impl_node_port_use_buffers(void *object,
}
for (j = 0; j < n_datas; j++) {
if (!((d[j].type == SPA_DATA_MemPtr ||
d[j].type == SPA_DATA_MemFd ||
d[j].type == SPA_DATA_DmaBuf) && d[j].data != NULL)) {
if (d[j].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory %d on buffer %d %d %p",
this, j, i, d[j].type, d[j].data);
return -EINVAL;

4
spa/plugins/audioconvert/resample.c
View file

@ -602,9 +602,7 @@ impl_node_port_use_buffers(void *object,
if (size != d[j].maxsize)
return -EINVAL;
if (!((d[j].type == SPA_DATA_MemPtr ||
d[j].type == SPA_DATA_MemFd ||
d[j].type == SPA_DATA_DmaBuf) && d[j].data != NULL)) {
if (d[j].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
buffers[i]);
return -EINVAL;

4
spa/plugins/audioconvert/splitter.c
View file

@ -745,9 +745,7 @@ impl_node_port_use_buffers(void *object,
b->flags = 0;
for (j = 0; j < n_datas; j++) {
if (!((d[j].type == SPA_DATA_MemPtr ||
d[j].type == SPA_DATA_MemFd ||
d[j].type == SPA_DATA_DmaBuf) && d[j].data != NULL)) {
if (d[j].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory %d on buffer %d %d %p",
this, j, i, d[j].type, d[j].data);
return -EINVAL;

4
spa/plugins/audioconvert/test-source.c
View file

@ -663,9 +663,7 @@ impl_node_port_use_buffers(void *object,
else if (size != d[j].maxsize)
return -EINVAL;
if (!((d[j].type == SPA_DATA_MemPtr ||
d[j].type == SPA_DATA_MemFd ||
d[j].type == SPA_DATA_DmaBuf) && d[j].data != NULL)) {
if (d[j].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
buffers[i]);
return -EINVAL;

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

@ -559,9 +559,7 @@ impl_node_port_use_buffers(void *object,
b->outstanding = (direction == SPA_DIRECTION_INPUT);
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
if (!((d[0].type == SPA_DATA_MemPtr ||
d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf) && d[0].data != NULL)) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
buffers[i]);
return -EINVAL;

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

@ -591,9 +591,7 @@ impl_node_port_use_buffers(void *object,
b->id = i;
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
if (!((d[0].type == SPA_DATA_MemPtr ||
d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf) && d[0].data != NULL)) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory on buffer %d", this, i);
return -EINVAL;
}

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

@ -780,9 +780,7 @@ impl_node_port_use_buffers(void *object,
b->outstanding = false;
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
if ((d[0].type == SPA_DATA_MemPtr ||
d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf) && d[0].data == NULL) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
buffers[i]);
return -EINVAL;

6
spa/plugins/bluez5/a2dp-sink.c
View file

@ -1233,7 +1233,6 @@ impl_node_port_use_buffers(void *object,
for (i = 0; i < n_buffers; i++) {
struct buffer *b = &port->buffers[i];
uint32_t type;
b->buf = buffers[i];
b->id = i;
@ -1241,10 +1240,7 @@ impl_node_port_use_buffers(void *object,
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
type = buffers[i]->datas[0].type;
if ((type == SPA_DATA_MemFd ||
type == SPA_DATA_DmaBuf ||
type == SPA_DATA_MemPtr) && buffers[i]->datas[0].data == NULL) {
if (buffers[i]->datas[0].data == NULL) {
spa_log_error(this->log, NAME " %p: need mapped memory", this);
return -EINVAL;
}

4
spa/plugins/bluez5/a2dp-source.c
View file

@ -898,9 +898,7 @@ impl_node_port_use_buffers(void *object,
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
if (!((d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf ||
d[0].type == SPA_DATA_MemPtr) && d[0].data != NULL)) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: need mapped memory", this);
return -EINVAL;
}

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

@ -923,7 +923,6 @@ impl_node_port_use_buffers(void *object,
for (i = 0; i < n_buffers; i++) {
struct buffer *b = &port->buffers[i];
uint32_t type;
b->buf = buffers[i];
b->id = i;
@ -931,10 +930,7 @@ impl_node_port_use_buffers(void *object,
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
type = buffers[i]->datas[0].type;
if ((type == SPA_DATA_MemFd ||
type == SPA_DATA_DmaBuf ||
type == SPA_DATA_MemPtr) && buffers[i]->datas[0].data == NULL) {
if (buffers[i]->datas[0].data == NULL) {
spa_log_error(this->log, NAME " %p: need mapped memory", this);
return -EINVAL;
}

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

@ -829,9 +829,7 @@ impl_node_port_use_buffers(void *object,
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
if (!((d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf ||
d[0].type == SPA_DATA_MemPtr) && d[0].data != NULL)) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: need mapped memory", this);
return -EINVAL;
}

4
spa/plugins/test/fakesink.c
View file

@ -584,9 +584,7 @@ impl_node_port_use_buffers(void *object,
b->outstanding = true;
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
if ((d[0].type == SPA_DATA_MemPtr ||
d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf) && d[0].data == NULL) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
buffers[i]);
}

4
spa/plugins/test/fakesrc.c
View file

@ -599,9 +599,7 @@ impl_node_port_use_buffers(void *object,
b->outstanding = false;
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
if ((d[0].type == SPA_DATA_MemPtr ||
d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf) && d[0].data == NULL) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
buffers[i]);
}

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

@ -699,9 +699,7 @@ impl_node_port_use_buffers(void *object,
b->outstanding = false;
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
if ((d[0].type == SPA_DATA_MemPtr ||
d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf) && d[0].data == NULL) {
if (d[0].data == NULL) {
spa_log_error(this->log, NAME " %p: invalid memory on buffer %p", this,
buffers[i]);
return -EINVAL;

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

@ -530,9 +530,7 @@ impl_node_port_use_buffers(void *object,
b->flags = direction == SPA_DIRECTION_INPUT ? BUFFER_FLAG_OUT : 0;
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
if ((d[0].type == SPA_DATA_MemPtr ||
d[0].type == SPA_DATA_MemFd ||
d[0].type == SPA_DATA_DmaBuf) && d[0].data != NULL) {
if (d[0].data == NULL) {
b->ptr = d[0].data;
b->size = d[0].maxsize;
} else {