Index: source/libvpx/vpx_mem/vpx_mem.h |
=================================================================== |
--- source/libvpx/vpx_mem/vpx_mem.h (revision 172621) |
+++ source/libvpx/vpx_mem/vpx_mem.h (working copy) |
@@ -12,6 +12,7 @@ |
#ifndef __VPX_MEM_H__ |
#define __VPX_MEM_H__ |
+#include "vpx_config.h" |
#if defined(__uClinux__) |
# include <lddk.h> |
#endif |
@@ -30,11 +31,11 @@ |
#endif |
#ifndef VPX_CHECK_MEM_FUNCTIONS |
# define VPX_CHECK_MEM_FUNCTIONS 0 /* enable basic safety checks in _memcpy, |
- _memset, and _memmove */ |
+_memset, and _memmove */ |
#endif |
#ifndef REPLACE_BUILTIN_FUNCTIONS |
# define REPLACE_BUILTIN_FUNCTIONS 0 /* replace builtin functions with their |
- vpx_ equivalents */ |
+vpx_ equivalents */ |
#endif |
#include <stdlib.h> |
@@ -44,60 +45,60 @@ |
extern "C" { |
#endif |
- /* |
- vpx_mem_get_version() |
- provided for runtime version checking. Returns an unsigned int of the form |
- CHIEF | MAJOR | MINOR | PATCH, where the chief version number is the high |
- order byte. |
- */ |
- unsigned int vpx_mem_get_version(void); |
+ /* |
+ vpx_mem_get_version() |
+ provided for runtime version checking. Returns an unsigned int of the form |
+ CHIEF | MAJOR | MINOR | PATCH, where the chief version number is the high |
+ order byte. |
+ */ |
+ unsigned int vpx_mem_get_version(void); |
- /* |
- vpx_mem_set_heap_size(size_t size) |
- size - size in bytes for the memory manager to allocate for its heap |
- Sets the memory manager's initial heap size |
- Return: |
- 0: on success |
- -1: if memory manager calls have not been included in the vpx_mem lib |
- -2: if the memory manager has been compiled to use static memory |
- -3: if the memory manager has already allocated its heap |
- */ |
- int vpx_mem_set_heap_size(size_t size); |
+ /* |
+ vpx_mem_set_heap_size(size_t size) |
+ size - size in bytes for the memory manager to allocate for its heap |
+ Sets the memory manager's initial heap size |
+ Return: |
+ 0: on success |
+ -1: if memory manager calls have not been included in the vpx_mem lib |
+ -2: if the memory manager has been compiled to use static memory |
+ -3: if the memory manager has already allocated its heap |
+ */ |
+ int vpx_mem_set_heap_size(size_t size); |
- void *vpx_memalign(size_t align, size_t size); |
- void *vpx_malloc(size_t size); |
- void *vpx_calloc(size_t num, size_t size); |
- void *vpx_realloc(void *memblk, size_t size); |
- void vpx_free(void *memblk); |
+ void *vpx_memalign(size_t align, size_t size); |
+ void *vpx_malloc(size_t size); |
+ void *vpx_calloc(size_t num, size_t size); |
+ void *vpx_realloc(void *memblk, size_t size); |
+ void vpx_free(void *memblk); |
- void *vpx_memcpy(void *dest, const void *src, size_t length); |
- void *vpx_memset(void *dest, int val, size_t length); |
- void *vpx_memmove(void *dest, const void *src, size_t count); |
+ void *vpx_memcpy(void *dest, const void *src, size_t length); |
+ void *vpx_memset(void *dest, int val, size_t length); |
+ void *vpx_memmove(void *dest, const void *src, size_t count); |
- /* special memory functions */ |
- void *vpx_mem_alloc(int id, size_t size, size_t align); |
- void vpx_mem_free(int id, void *mem, size_t size); |
+ /* special memory functions */ |
+ void *vpx_mem_alloc(int id, size_t size, size_t align); |
+ void vpx_mem_free(int id, void *mem, size_t size); |
- /* Wrappers to standard library functions. */ |
- typedef void*(* g_malloc_func)(size_t); |
- typedef void*(* g_calloc_func)(size_t, size_t); |
- typedef void*(* g_realloc_func)(void *, size_t); |
- typedef void (* g_free_func)(void *); |
- typedef void*(* g_memcpy_func)(void *, const void *, size_t); |
- typedef void*(* g_memset_func)(void *, int, size_t); |
- typedef void*(* g_memmove_func)(void *, const void *, size_t); |
+ /* Wrappers to standard library functions. */ |
+ typedef void *(* g_malloc_func)(size_t); |
+ typedef void *(* g_calloc_func)(size_t, size_t); |
+ typedef void *(* g_realloc_func)(void *, size_t); |
+ typedef void (* g_free_func)(void *); |
+ typedef void *(* g_memcpy_func)(void *, const void *, size_t); |
+ typedef void *(* g_memset_func)(void *, int, size_t); |
+ typedef void *(* g_memmove_func)(void *, const void *, size_t); |
- int vpx_mem_set_functions(g_malloc_func g_malloc_l |
- , g_calloc_func g_calloc_l |
- , g_realloc_func g_realloc_l |
- , g_free_func g_free_l |
- , g_memcpy_func g_memcpy_l |
- , g_memset_func g_memset_l |
- , g_memmove_func g_memmove_l); |
- int vpx_mem_unset_functions(void); |
+ int vpx_mem_set_functions(g_malloc_func g_malloc_l |
+, g_calloc_func g_calloc_l |
+, g_realloc_func g_realloc_l |
+, g_free_func g_free_l |
+, g_memcpy_func g_memcpy_l |
+, g_memset_func g_memset_l |
+, g_memmove_func g_memmove_l); |
+ int vpx_mem_unset_functions(void); |
- /* some defines for backward compatibility */ |
+ /* some defines for backward compatibility */ |
#define DMEM_GENERAL 0 |
#define duck_memalign(X,Y,Z) vpx_memalign(X,Y) |
@@ -124,13 +125,13 @@ |
#if CONFIG_MEM_TRACKER |
#include <stdarg.h> |
- /*from vpx_mem/vpx_mem_tracker.c*/ |
- extern void vpx_memory_tracker_dump(); |
- extern void vpx_memory_tracker_check_integrity(char *file, unsigned int line); |
- extern int vpx_memory_tracker_set_log_type(int type, char *option); |
- extern int vpx_memory_tracker_set_log_func(void *userdata, |
- void(*logfunc)(void *userdata, |
- const char *fmt, va_list args)); |
+ /*from vpx_mem/vpx_mem_tracker.c*/ |
+ extern void vpx_memory_tracker_dump(); |
+ extern void vpx_memory_tracker_check_integrity(char *file, unsigned int line); |
+ extern int vpx_memory_tracker_set_log_type(int type, char *option); |
+ extern int vpx_memory_tracker_set_log_func(void *userdata, |
+ void(*logfunc)(void *userdata, |
+ const char *fmt, va_list args)); |
# ifndef __VPX_MEM_C__ |
# define vpx_memalign(align, size) xvpx_memalign((align), (size), __FILE__, __LINE__) |
# define vpx_malloc(size) xvpx_malloc((size), __FILE__, __LINE__) |
@@ -142,13 +143,13 @@ |
# define vpx_mem_free(id,mem,size) xvpx_mem_free(id, mem, size, __FILE__, __LINE__) |
# endif |
- void *xvpx_memalign(size_t align, size_t size, char *file, int line); |
- void *xvpx_malloc(size_t size, char *file, int line); |
- void *xvpx_calloc(size_t num, size_t size, char *file, int line); |
- void *xvpx_realloc(void *memblk, size_t size, char *file, int line); |
- void xvpx_free(void *memblk, char *file, int line); |
- void *xvpx_mem_alloc(int id, size_t size, size_t align, char *file, int line); |
- void xvpx_mem_free(int id, void *mem, size_t size, char *file, int line); |
+ void *xvpx_memalign(size_t align, size_t size, char *file, int line); |
+ void *xvpx_malloc(size_t size, char *file, int line); |
+ void *xvpx_calloc(size_t num, size_t size, char *file, int line); |
+ void *xvpx_realloc(void *memblk, size_t size, char *file, int line); |
+ void xvpx_free(void *memblk, char *file, int line); |
+ void *xvpx_mem_alloc(int id, size_t size, size_t align, char *file, int line); |
+ void xvpx_mem_free(int id, void *mem, size_t size, char *file, int line); |
#else |
# ifndef __VPX_MEM_C__ |