generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "vpx_mem: remove 'mem checks'"

Browse Source
This commit is contained in:
Johann 2015-04-22 13:09:47 -07:00 committed by Gerrit Code Review
commit 4a29474c83
4 changed files with 5 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -297,7 +297,6 @@ CONFIG_LIST="
debug_libs debug_libs
fast_unaligned fast_unaligned
mem_tracker mem_tracker
mem_checks
dequant_tokens dequant_tokens
dc_recon dc_recon

5
vpx_mem/include/vpx_mem_intrnl.h
View File

@ -17,11 +17,6 @@
# define CONFIG_MEM_TRACKER 1 /*include xvpx_* calls in the lib*/ # define CONFIG_MEM_TRACKER 1 /*include xvpx_* calls in the lib*/
#endif #endif
#ifndef CONFIG_MEM_CHECKS
# define CONFIG_MEM_CHECKS 0 /*include some basic safety checks in
vpx_memcpy, _memset, and _memmove*/
#endif
#ifndef USE_GLOBAL_FUNCTION_POINTERS #ifndef USE_GLOBAL_FUNCTION_POINTERS
# define USE_GLOBAL_FUNCTION_POINTERS 0 /*use function pointers instead of compiled functions.*/ # define USE_GLOBAL_FUNCTION_POINTERS 0 /*use function pointers instead of compiled functions.*/
#endif #endif

82
vpx_mem/vpx_mem.c
View File

@ -322,84 +322,16 @@ void xvpx_free(void *p_address, char *file, int line) {
#endif /*CONFIG_MEM_TRACKER*/ #endif /*CONFIG_MEM_TRACKER*/
#if CONFIG_MEM_CHECKS
#if defined(VXWORKS)
#include <task_lib.h> /*for task_delay()*/
/* This function is only used to get a stack trace of the player
object so we can se where we are having a problem. */
static int get_my_tt(int task) {
tt(task);
return 0;
}
static void vx_sleep(int msec) {
int ticks_to_sleep = 0;
if (msec) {
int msec_per_tick = 1000 / sys_clk_rate_get();
if (msec < msec_per_tick)
ticks_to_sleep++;
else
ticks_to_sleep = msec / msec_per_tick;
}
task_delay(ticks_to_sleep);
}
#endif
#endif
void *vpx_memcpy(void *dest, const void *source, size_t length) { void *vpx_memcpy(void *dest, const void *source, size_t length) {
#if CONFIG_MEM_CHECKS
if (((int)dest < 0x4000) || ((int)source < 0x4000)) {
_P(printf("WARNING: vpx_memcpy dest:0x%x source:0x%x len:%d\n", (int)dest, (int)source, length);)
#if defined(VXWORKS)
sp(get_my_tt, task_id_self(), 0, 0, 0, 0, 0, 0, 0, 0);
vx_sleep(10000);
#endif
}
#endif
return VPX_MEMCPY_L(dest, source, length); return VPX_MEMCPY_L(dest, source, length);
} }
void *vpx_memset(void *dest, int val, size_t length) { void *vpx_memset(void *dest, int val, size_t length) {
#if CONFIG_MEM_CHECKS
if ((int)dest < 0x4000) {
_P(printf("WARNING: vpx_memset dest:0x%x val:%d len:%d\n", (int)dest, val, length);)
#if defined(VXWORKS)
sp(get_my_tt, task_id_self(), 0, 0, 0, 0, 0, 0, 0, 0);
vx_sleep(10000);
#endif
}
#endif
return VPX_MEMSET_L(dest, val, length); return VPX_MEMSET_L(dest, val, length);
} }
#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
void *vpx_memset16(void *dest, int val, size_t length) { void *vpx_memset16(void *dest, int val, size_t length) {
#if CONFIG_MEM_CHECKS
if ((int)dest < 0x4000) {
_P(printf("WARNING: vpx_memset dest:0x%x val:%d len:%d\n",
(int)dest, val, length);)
#if defined(VXWORKS)
sp(get_my_tt, task_id_self(), 0, 0, 0, 0, 0, 0, 0, 0);
vx_sleep(10000);
#endif
}
#endif
int i; int i;
void *orig = dest; void *orig = dest;
uint16_t *dest16 = dest; uint16_t *dest16 = dest;
@ -410,20 +342,6 @@ void *vpx_memset16(void *dest, int val, size_t length) {
#endif // CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
void *vpx_memmove(void *dest, const void *src, size_t count) { void *vpx_memmove(void *dest, const void *src, size_t count) {
#if CONFIG_MEM_CHECKS
if (((int)dest < 0x4000) || ((int)src < 0x4000)) {
_P(printf("WARNING: vpx_memmove dest:0x%x src:0x%x count:%d\n", (int)dest, (int)src, count);)
#if defined(VXWORKS)
sp(get_my_tt, task_id_self(), 0, 0, 0, 0, 0, 0, 0, 0);
vx_sleep(10000);
#endif
}
#endif
return VPX_MEMMOVE_L(dest, src, count); return VPX_MEMMOVE_L(dest, src, count);
} }

16
vpx_mem/vpx_mem.h
View File

@ -29,10 +29,6 @@
#ifndef VPX_TRACK_MEM_USAGE #ifndef VPX_TRACK_MEM_USAGE
# define VPX_TRACK_MEM_USAGE 0 /* enable memory tracking/integrity checks */ # define VPX_TRACK_MEM_USAGE 0 /* enable memory tracking/integrity checks */
#endif #endif
#ifndef VPX_CHECK_MEM_FUNCTIONS
# define VPX_CHECK_MEM_FUNCTIONS 0 /* enable basic safety checks in _memcpy,
_memset, and _memmove */
#endif
#ifndef REPLACE_BUILTIN_FUNCTIONS #ifndef REPLACE_BUILTIN_FUNCTIONS
# define REPLACE_BUILTIN_FUNCTIONS 0 /* replace builtin functions with their # define REPLACE_BUILTIN_FUNCTIONS 0 /* replace builtin functions with their
vpx_ equivalents */ vpx_ equivalents */
@ -144,13 +140,11 @@ extern "C" {
# endif # endif
#endif #endif
#if !VPX_CHECK_MEM_FUNCTIONS #ifndef __VPX_MEM_C__
# ifndef __VPX_MEM_C__ # include <string.h>
# include <string.h> # define vpx_memcpy memcpy
# define vpx_memcpy memcpy # define vpx_memset memset
# define vpx_memset memset # define vpx_memmove memmove
# define vpx_memmove memmove
# endif
#endif #endif
#ifdef VPX_MEM_PLTFRM #ifdef VPX_MEM_PLTFRM