mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-18 06:46:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

add spa_memcpy to more places

Browse source 
Use spa_memcpy yo where we memcpy data so that when the debug option is
enabled we can see more.
This commit is contained in:
Wim Taymans 2026-04-16 12:11:13 +02:00
parent 54aba261d2
commit adad89dc0e
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pipewire-jack/src/pipewire-jack.c
View file

@ -1767,7 +1767,7 @@ static inline void process_empty(struct port *p, uint32_t frames)
case TYPE_ID_AUDIO: case TYPE_ID_AUDIO:
ptr = get_buffer_output(p, frames, sizeof(float), NULL); ptr = get_buffer_output(p, frames, sizeof(float), NULL);
if (SPA_LIKELY(ptr != NULL)) if (SPA_LIKELY(ptr != NULL))
memcpy(ptr, src, frames * sizeof(float)); spa_memcpy(ptr, src, frames * sizeof(float));
break; break;
case TYPE_ID_MIDI: case TYPE_ID_MIDI:
case TYPE_ID_OSC: case TYPE_ID_OSC:
@ -1781,7 +1781,7 @@ static inline void process_empty(struct port *p, uint32_t frames)
* to do this concurrently */ * to do this concurrently */
b->datas[0].chunk->size = convert_from_event(src, midi_scratch, b->datas[0].chunk->size = convert_from_event(src, midi_scratch,
MIDI_SCRATCH_FRAMES * sizeof(float), type); MIDI_SCRATCH_FRAMES * sizeof(float), type);
memcpy(ptr, midi_scratch, b->datas[0].chunk->size); spa_memcpy(ptr, midi_scratch, b->datas[0].chunk->size);
} }
break; break;
} }
@ -5850,11 +5850,11 @@ static void *get_buffer_input_midi(struct port *p, jack_nframes_t frames)
* the per port buffer. This makes it possible to call this function concurrently * the per port buffer. This makes it possible to call this function concurrently
* but also have different pointers per port */ * but also have different pointers per port */
convert_to_event(mix_info, n_mix_info, mb, p->client->fix_midi_events, p->object->port.type_id); convert_to_event(mix_info, n_mix_info, mb, p->client->fix_midi_events, p->object->port.type_id);
memcpy(ptr, mb, sizeof(struct midi_buffer) + (mb->event_count spa_memcpy(ptr, mb, sizeof(struct midi_buffer) + (mb->event_count
* sizeof(struct midi_event))); * sizeof(struct midi_event)));
if (mb->write_pos > 0) { if (mb->write_pos > 0) {
size_t offs = mb->buffer_size - mb->write_pos; size_t offs = mb->buffer_size - mb->write_pos;
memcpy(SPA_PTROFF(ptr, offs, void), SPA_PTROFF(mb, offs, void), mb->write_pos); spa_memcpy(SPA_PTROFF(ptr, offs, void), SPA_PTROFF(mb, offs, void), mb->write_pos);
} }
return ptr; return ptr;
} }

12
pipewire-jack/src/ringbuffer.c
View file

@ -132,10 +132,10 @@ size_t jack_ringbuffer_read(jack_ringbuffer_t *rb, char *dest, size_t cnt)
n2 = 0; n2 = 0;
} }
memcpy (dest, &(rb->buf[rb->read_ptr]), n1); spa_memcpy (dest, &(rb->buf[rb->read_ptr]), n1);
rb->read_ptr = (rb->read_ptr + n1) & rb->size_mask; rb->read_ptr = (rb->read_ptr + n1) & rb->size_mask;
if (n2) { if (n2) {
memcpy (dest + n1, &(rb->buf[rb->read_ptr]), n2); spa_memcpy (dest + n1, &(rb->buf[rb->read_ptr]), n2);
rb->read_ptr = (rb->read_ptr + n2) & rb->size_mask; rb->read_ptr = (rb->read_ptr + n2) & rb->size_mask;
} }
return to_read; return to_read;
@ -167,11 +167,11 @@ size_t jack_ringbuffer_peek(jack_ringbuffer_t *rb, char *dest, size_t cnt)
n2 = 0; n2 = 0;
} }
memcpy (dest, &(rb->buf[tmp_read_ptr]), n1); spa_memcpy (dest, &(rb->buf[tmp_read_ptr]), n1);
tmp_read_ptr = (tmp_read_ptr + n1) & rb->size_mask; tmp_read_ptr = (tmp_read_ptr + n1) & rb->size_mask;
if (n2) if (n2)
memcpy (dest + n1, &(rb->buf[tmp_read_ptr]), n2); spa_memcpy (dest + n1, &(rb->buf[tmp_read_ptr]), n2);
return to_read; return to_read;
} }
@ -249,10 +249,10 @@ size_t jack_ringbuffer_write(jack_ringbuffer_t *rb, const char *src,
n2 = 0; n2 = 0;
} }
memcpy (&(rb->buf[rb->write_ptr]), src, n1); spa_memcpy (&(rb->buf[rb->write_ptr]), src, n1);
rb->write_ptr = (rb->write_ptr + n1) & rb->size_mask; rb->write_ptr = (rb->write_ptr + n1) & rb->size_mask;
if (n2) { if (n2) {
memcpy (&(rb->buf[rb->write_ptr]), src + n1, n2); spa_memcpy (&(rb->buf[rb->write_ptr]), src + n1, n2);
rb->write_ptr = (rb->write_ptr + n2) & rb->size_mask; rb->write_ptr = (rb->write_ptr + n2) & rb->size_mask;
} }
return to_write; return to_write;

2
spa/plugins/filter-graph/plugin_ffmpeg.c
View file

@ -243,7 +243,7 @@ static void ffmpeg_run(void *instance, unsigned long SampleCount)
delay); delay);
for (j = 0; j < desc->layout[c].nb_channels; j++) for (j = 0; j < desc->layout[c].nb_channels; j++)
memcpy(i->data[d++], i->frame->data[j], SampleCount * sizeof(float)); spa_memcpy(i->data[d++], i->frame->data[j], SampleCount * sizeof(float));
av_frame_unref(i->frame); av_frame_unref(i->frame);
} }

2
src/tools/pw-cat.c
View file

@ -389,7 +389,7 @@ static int encoded_playback_fill(struct data *d, void *dest, unsigned int n_fram
break; break;
} }
memcpy(dest_ptr, packet->data, packet->size); spa_memcpy(dest_ptr, packet->data, packet->size);
accumulated_duration += packet->duration; accumulated_duration += packet->duration;
dest_ptr += packet->size; dest_ptr += packet->size;