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

reduce number of allocated memblocks when receiving RTP data by reusing blocks

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2429 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-15 18:00:31 +00:00
parent d10ee7d6e2
commit 2bc77ff49a
2 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/modules/rtp/rtp.c
View file

@ -55,6 +55,8 @@ pa_rtp_context* pa_rtp_context_init_send(pa_rtp_context *c, int fd, uint32_t ssr
c->payload = payload & 127;
c->frame_size = frame_size;
pa_memchunk_reset(&c->memchunk);
return c;
}
@ -152,6 +154,8 @@ pa_rtp_context* pa_rtp_context_init_recv(pa_rtp_context *c, int fd, size_t frame
c->fd = fd;
c->frame_size = frame_size;
pa_memchunk_reset(&c->memchunk);
return c;
}
@ -173,12 +177,28 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool) {
goto fail;
}
if (!size)
if (size <= 0)
return 0;
chunk->memblock = pa_memblock_new(pool, size);
if (c->memchunk.length < (unsigned) size) {
size_t l;
iov.iov_base = pa_memblock_acquire(chunk->memblock);
if (c->memchunk.memblock)
pa_memblock_unref(c->memchunk.memblock);
l = PA_MAX((size_t) size, pa_mempool_block_size_max(pool));
c->memchunk.memblock = pa_memblock_new(pool, l);
c->memchunk.index = 0;
c->memchunk.length = pa_memblock_get_length(c->memchunk.memblock);
}
pa_assert(c->memchunk.length >= (size_t) size);
chunk->memblock = pa_memblock_ref(c->memchunk.memblock);
chunk->index = c->memchunk.index;
iov.iov_base = (uint8_t*) pa_memblock_acquire(chunk->memblock) + chunk->index;
iov.iov_len = size;
m.msg_name = NULL;
@ -236,14 +256,22 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool) {
goto fail;
}
chunk->index = 12 + cc*4;
chunk->length = size - chunk->index;
chunk->index += 12 + cc*4;
chunk->length = size - 12 + cc*4;
if (chunk->length % c->frame_size != 0) {
pa_log_warn("Bad RTP packet size.");
goto fail;
}
c->memchunk.index = chunk->index + chunk->length;
c->memchunk.length = pa_memblock_get_length(c->memchunk.memblock) - c->memchunk.index;
if (c->memchunk.length <= 0) {
pa_memblock_unref(c->memchunk.memblock);
pa_memchunk_reset(&c->memchunk);
}
return 0;
fail:
@ -329,7 +357,10 @@ int pa_rtp_sample_spec_valid(const pa_sample_spec *ss) {
void pa_rtp_context_destroy(pa_rtp_context *c) {
pa_assert(c);
pa_close(c->fd);
pa_assert_se(pa_close(c->fd) == 0);
if (c->memchunk.memblock)
pa_memblock_unref(c->memchunk.memblock);
}
const char* pa_rtp_format_to_string(pa_sample_format_t f) {
@ -361,4 +392,3 @@ pa_sample_format_t pa_rtp_string_to_format(const char *s) {
else
return PA_SAMPLE_INVALID;
}

2
src/modules/rtp/rtp.h
View file

@ -37,6 +37,8 @@ typedef struct pa_rtp_context {
uint32_t ssrc;
uint8_t payload;
size_t frame_size;
pa_memchunk memchunk;
} pa_rtp_context;
pa_rtp_context* pa_rtp_context_init_send(pa_rtp_context *c, int fd, uint32_t ssrc, uint8_t payload, size_t frame_size);