avutil/mem: make ff_fast_malloc() internal to mem.c
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
e44cb7363f
commit
786be70e28
|
@ -510,12 +510,31 @@ void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size)
|
||||||
return ptr;
|
return ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc)
|
||||||
|
{
|
||||||
|
void *val;
|
||||||
|
|
||||||
|
memcpy(&val, ptr, sizeof(val));
|
||||||
|
if (min_size <= *size) {
|
||||||
|
av_assert0(val || !min_size);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
min_size = FFMAX(min_size + min_size / 16 + 32, min_size);
|
||||||
|
av_freep(ptr);
|
||||||
|
val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size);
|
||||||
|
memcpy(ptr, &val, sizeof(val));
|
||||||
|
if (!val)
|
||||||
|
min_size = 0;
|
||||||
|
*size = min_size;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size)
|
void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size)
|
||||||
{
|
{
|
||||||
ff_fast_malloc(ptr, size, min_size, 0);
|
fast_malloc(ptr, size, min_size, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size)
|
void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size)
|
||||||
{
|
{
|
||||||
ff_fast_malloc(ptr, size, min_size, 1);
|
fast_malloc(ptr, size, min_size, 1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,22 +136,4 @@
|
||||||
# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,))
|
# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc)
|
|
||||||
{
|
|
||||||
void *val;
|
|
||||||
|
|
||||||
memcpy(&val, ptr, sizeof(val));
|
|
||||||
if (min_size <= *size) {
|
|
||||||
av_assert0(val || !min_size);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
min_size = FFMAX(min_size + min_size / 16 + 32, min_size);
|
|
||||||
av_freep(ptr);
|
|
||||||
val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size);
|
|
||||||
memcpy(ptr, &val, sizeof(val));
|
|
||||||
if (!val)
|
|
||||||
min_size = 0;
|
|
||||||
*size = min_size;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
#endif /* AVUTIL_MEM_INTERNAL_H */
|
#endif /* AVUTIL_MEM_INTERNAL_H */
|
||||||
|
|
Loading…
Reference in New Issue