mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

split memblocks into multiples of the mempool tile size

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1832 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-16 21:58:04 +00:00
parent ac1ee4e675
commit 5df7a85473
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pulsecore/pstream.c
View file

@ -40,16 +40,17 @@
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#include "winsock.h"
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulsecore/winsock.h>
#include <pulsecore/queue.h> #include <pulsecore/queue.h>
#include <pulsecore/log.h> #include <pulsecore/log.h>
#include <pulsecore/core-scache.h> #include <pulsecore/core-scache.h>
#include <pulsecore/creds.h> #include <pulsecore/creds.h>
#include <pulsecore/refcnt.h> #include <pulsecore/refcnt.h>
#include <pulsecore/flist.h> #include <pulsecore/flist.h>
#include <pulsecore/macro.h>
#include "pstream.h" #include "pstream.h"
@ -83,7 +84,6 @@ typedef uint32_t pa_pstream_descriptor[PA_PSTREAM_DESCRIPTOR_MAX];
#define PA_PSTREAM_DESCRIPTOR_SIZE (PA_PSTREAM_DESCRIPTOR_MAX*sizeof(uint32_t)) #define PA_PSTREAM_DESCRIPTOR_SIZE (PA_PSTREAM_DESCRIPTOR_MAX*sizeof(uint32_t))
#define FRAME_SIZE_MAX_ALLOW PA_SCACHE_ENTRY_SIZE_MAX /* allow uploading a single sample in one frame at max */ #define FRAME_SIZE_MAX_ALLOW PA_SCACHE_ENTRY_SIZE_MAX /* allow uploading a single sample in one frame at max */
#define FRAME_SIZE_MAX_USE (1024*64)
PA_STATIC_FLIST_DECLARE(items, 0, pa_xfree); PA_STATIC_FLIST_DECLARE(items, 0, pa_xfree);
@ -351,6 +351,7 @@ void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, const pa_creds *cre
void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek_mode, const pa_memchunk *chunk) { void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek_mode, const pa_memchunk *chunk) {
size_t length, idx; size_t length, idx;
size_t bsm;
pa_assert(p); pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0); pa_assert(PA_REFCNT_VALUE(p) > 0);
@ -362,6 +363,8 @@ void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa
idx = 0; idx = 0;
length = chunk->length; length = chunk->length;
bsm = pa_mempool_block_size_max(p->mempool);
while (length > 0) { while (length > 0) {
struct item_info *i; struct item_info *i;
@ -371,7 +374,7 @@ void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa
i = pa_xnew(struct item_info, 1); i = pa_xnew(struct item_info, 1);
i->type = PA_PSTREAM_ITEM_MEMBLOCK; i->type = PA_PSTREAM_ITEM_MEMBLOCK;
n = length < FRAME_SIZE_MAX_USE ? length : FRAME_SIZE_MAX_USE; n = MIN(length, bsm);
i->chunk.index = chunk->index + idx; i->chunk.index = chunk->index + idx;
i->chunk.length = n; i->chunk.length = n;
i->chunk.memblock = pa_memblock_ref(chunk->memblock); i->chunk.memblock = pa_memblock_ref(chunk->memblock);