Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(441)

Side by Side Diff: source/libvpx/vpx_mem/vpx_mem.h

Issue 554673004: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vpx/vpx_image.h ('k') | source/libvpx/vpx_mem/vpx_mem.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 int vpx_mem_set_heap_size(size_t size); 66 int vpx_mem_set_heap_size(size_t size);
67 67
68 void *vpx_memalign(size_t align, size_t size); 68 void *vpx_memalign(size_t align, size_t size);
69 void *vpx_malloc(size_t size); 69 void *vpx_malloc(size_t size);
70 void *vpx_calloc(size_t num, size_t size); 70 void *vpx_calloc(size_t num, size_t size);
71 void *vpx_realloc(void *memblk, size_t size); 71 void *vpx_realloc(void *memblk, size_t size);
72 void vpx_free(void *memblk); 72 void vpx_free(void *memblk);
73 73
74 void *vpx_memcpy(void *dest, const void *src, size_t length); 74 void *vpx_memcpy(void *dest, const void *src, size_t length);
75 void *vpx_memset(void *dest, int val, size_t length); 75 void *vpx_memset(void *dest, int val, size_t length);
76 #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
77 void *vpx_memset16(void *dest, int val, size_t length);
78 #endif
76 void *vpx_memmove(void *dest, const void *src, size_t count); 79 void *vpx_memmove(void *dest, const void *src, size_t count);
77 80
78 /* special memory functions */ 81 /* special memory functions */
79 void *vpx_mem_alloc(int id, size_t size, size_t align); 82 void *vpx_mem_alloc(int id, size_t size, size_t align);
80 void vpx_mem_free(int id, void *mem, size_t size); 83 void vpx_mem_free(int id, void *mem, size_t size);
81 84
82 /* Wrappers to standard library functions. */ 85 /* Wrappers to standard library functions. */
83 typedef void *(* g_malloc_func)(size_t); 86 typedef void *(* g_malloc_func)(size_t);
84 typedef void *(* g_calloc_func)(size_t, size_t); 87 typedef void *(* g_calloc_func)(size_t, size_t);
85 typedef void *(* g_realloc_func)(void *, size_t); 88 typedef void *(* g_realloc_func)(void *, size_t);
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 167
165 #ifdef VPX_MEM_PLTFRM 168 #ifdef VPX_MEM_PLTFRM
166 # include VPX_MEM_PLTFRM 169 # include VPX_MEM_PLTFRM
167 #endif 170 #endif
168 171
169 #if defined(__cplusplus) 172 #if defined(__cplusplus)
170 } 173 }
171 #endif 174 #endif
172 175
173 #endif // VPX_MEM_VPX_MEM_H_ 176 #endif // VPX_MEM_VPX_MEM_H_
OLDNEW
« no previous file with comments | « source/libvpx/vpx/vpx_image.h ('k') | source/libvpx/vpx_mem/vpx_mem.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698