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

tagstruct: Add type _APPENDED

Browse source 
add 128 bytes of storage in each tagstruct that will initially
be used; if this storage is exceeded the type changes to _DYNAMIC

v3: (thanks David Henningson)
* add comments explaining how memory is handled by different tagstruct types
v2: (thanks Alexander Patrakov)
* replace constant 100 with GROW_TAG_SIZE (the increment in with a dynamic tagstruct grows when extend()ed)

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-10-22 14:59:11 +02:00 • committed by Peter Meerwald
parent ab948629d3
commit adb577c905
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/pulsecore/tagstruct.c
View file

@ -39,6 +39,8 @@
#include "tagstruct.h"
#define MAX_TAG_SIZE (64*1024)
#define MAX_APPENDED_SIZE 128
#define GROW_TAG_SIZE 100
struct pa_tagstruct {
uint8_t *data;
@ -46,19 +48,23 @@ struct pa_tagstruct {
size_t rindex;
enum {
PA_TAGSTRUCT_FIXED,
PA_TAGSTRUCT_DYNAMIC,
PA_TAGSTRUCT_FIXED, /* The tagstruct does not own the data, buffer was provided by caller. */
PA_TAGSTRUCT_DYNAMIC, /* Buffer owned by tagstruct, data must be freed. */
PA_TAGSTRUCT_APPENDED, /* Data points to appended buffer, used for small tagstructs. Will change to dynamic if needed. */
} type;
union {
uint8_t appended[MAX_APPENDED_SIZE];
} per_type;
};
pa_tagstruct *pa_tagstruct_new(void) {
pa_tagstruct*t;
t = pa_xnew(pa_tagstruct, 1);
t->data = NULL;
t->allocated = t->length = 0;
t->rindex = 0;
t->type = PA_TAGSTRUCT_DYNAMIC;
t->data = t->per_type.appended;
t->allocated = MAX_APPENDED_SIZE;
t->length = t->rindex = 0;
t->type = PA_TAGSTRUCT_APPENDED;
return t;
}
@ -92,7 +98,13 @@ static inline void extend(pa_tagstruct*t, size_t l) {
if (t->length+l <= t->allocated)
return;
t->data = pa_xrealloc(t->data, t->allocated = t->length+l+100);
if (t->type == PA_TAGSTRUCT_DYNAMIC)
t->data = pa_xrealloc(t->data, t->allocated = t->length + l + GROW_TAG_SIZE);
else if (t->type == PA_TAGSTRUCT_APPENDED) {
t->type = PA_TAGSTRUCT_DYNAMIC;
t->data = pa_xmalloc(t->allocated = t->length + l + GROW_TAG_SIZE);
memcpy(t->data, t->per_type.appended, t->length);
}
}
static void write_u8(pa_tagstruct *t, uint8_t u) {