summaryrefslogtreecommitdiff
path: root/apps/codecs/libcook/libavutil/mem.c
diff options
context:
space:
mode:
authorMohamed Tarek <mt@rockbox.org>2009-05-12 20:50:35 +0000
committerMohamed Tarek <mt@rockbox.org>2009-05-12 20:50:35 +0000
commit49ba646d579a89d5ff0e4f3d5eea237eea22aafd (patch)
tree32aa872eb82b16c22f1915543c1512b116513209 /apps/codecs/libcook/libavutil/mem.c
parent49fccaf2d925def5cc57fff4a09b98a8fe318cc8 (diff)
downloadrockbox-49ba646d579a89d5ff0e4f3d5eea237eea22aafd.tar.gz
rockbox-49ba646d579a89d5ff0e4f3d5eea237eea22aafd.zip
-Remove all dynamic allocations, hence remove cook_decode_close() which was basically
needed for freeing allocated memory. -Remove any ffmpeg-specific attributes (av_const,av_always_inline .. etc.). -Move some math functions to cook_fixpoint.h - libavutil/common.h is no longer needed. -Remove libavutil/mem.[c/h], libavutil/common.h and libavutil/internal.h. -Fix a warning in cookdata_fixpoint.h. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20922 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libcook/libavutil/mem.c')
-rw-r--r--apps/codecs/libcook/libavutil/mem.c158
1 files changed, 0 insertions, 158 deletions
diff --git a/apps/codecs/libcook/libavutil/mem.c b/apps/codecs/libcook/libavutil/mem.c
deleted file mode 100644
index 7307df2384..0000000000
--- a/apps/codecs/libcook/libavutil/mem.c
+++ /dev/null
@@ -1,158 +0,0 @@
1/*
2 * default memory allocator for libavutil
3 * Copyright (c) 2002 Fabrice Bellard
4 *
5 * This file is part of FFmpeg.
6 *
7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version.
11 *
12 * FFmpeg is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details.
16 *
17 * You should have received a copy of the GNU Lesser General Public
18 * License along with FFmpeg; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */
21
22/**
23 * @file libavutil/mem.c
24 * default memory allocator for libavutil
25 */
26
27
28#include <limits.h>
29#include <stdlib.h>
30#include <string.h>
31#if HAVE_MALLOC_H
32#include <malloc.h>
33#endif
34
35#include "mem.h"
36
37/* here we can use OS-dependent allocation functions */
38#undef free
39#undef malloc
40#undef realloc
41
42/* You can redefine av_malloc and av_free in your project to use your
43 memory allocator. You do not need to suppress this file because the
44 linker will do it automatically. */
45
46void *av_malloc(unsigned int size)
47{
48 void *ptr = NULL;
49#if CONFIG_MEMALIGN_HACK
50 long diff;
51#endif
52
53 /* let's disallow possible ambiguous cases */
54 if(size > (INT_MAX-16) )
55 return NULL;
56
57#if CONFIG_MEMALIGN_HACK
58 ptr = malloc(size+16);
59 if(!ptr)
60 return ptr;
61 diff= ((-(long)ptr - 1)&15) + 1;
62 ptr = (char*)ptr + diff;
63 ((char*)ptr)[-1]= diff;
64#elif HAVE_POSIX_MEMALIGN
65 if (posix_memalign(&ptr,16,size))
66 ptr = NULL;
67#elif HAVE_MEMALIGN
68 ptr = memalign(16,size);
69 /* Why 64?
70 Indeed, we should align it:
71 on 4 for 386
72 on 16 for 486
73 on 32 for 586, PPro - K6-III
74 on 64 for K7 (maybe for P3 too).
75 Because L1 and L2 caches are aligned on those values.
76 But I don't want to code such logic here!
77 */
78 /* Why 16?
79 Because some CPUs need alignment, for example SSE2 on P4, & most RISC CPUs
80 it will just trigger an exception and the unaligned load will be done in the
81 exception handler or it will just segfault (SSE2 on P4).
82 Why not larger? Because I did not see a difference in benchmarks ...
83 */
84 /* benchmarks with P3
85 memalign(64)+1 3071,3051,3032
86 memalign(64)+2 3051,3032,3041
87 memalign(64)+4 2911,2896,2915
88 memalign(64)+8 2545,2554,2550
89 memalign(64)+16 2543,2572,2563
90 memalign(64)+32 2546,2545,2571
91 memalign(64)+64 2570,2533,2558
92
93 BTW, malloc seems to do 8-byte alignment by default here.
94 */
95#else
96 ptr = malloc(size);
97#endif
98 return ptr;
99}
100
101void *av_realloc(void *ptr, unsigned int size)
102{
103#if CONFIG_MEMALIGN_HACK
104 int diff;
105#endif
106
107 /* let's disallow possible ambiguous cases */
108 if(size > (INT_MAX-16) )
109 return NULL;
110
111#if CONFIG_MEMALIGN_HACK
112 //FIXME this isn't aligned correctly, though it probably isn't needed
113 if(!ptr) return av_malloc(size);
114 diff= ((char*)ptr)[-1];
115 return (char*)realloc((char*)ptr - diff, size + diff) + diff;
116#else
117 return realloc(ptr, size);
118#endif
119}
120
121void av_free(void *ptr)
122{
123 /* XXX: this test should not be needed on most libcs */
124 if (ptr)
125#if CONFIG_MEMALIGN_HACK
126 free((char*)ptr - ((char*)ptr)[-1]);
127#else
128 free(ptr);
129#endif
130}
131
132void av_freep(void *arg)
133{
134 void **ptr= (void**)arg;
135 av_free(*ptr);
136 *ptr = NULL;
137}
138
139void *av_mallocz(unsigned int size)
140{
141 void *ptr = av_malloc(size);
142 if (ptr)
143 memset(ptr, 0, size);
144 return ptr;
145}
146
147char *av_strdup(const char *s)
148{
149 char *ptr= NULL;
150 if(s){
151 int len = strlen(s) + 1;
152 ptr = av_malloc(len);
153 if (ptr)
154 memcpy(ptr, s, len);
155 }
156 return ptr;
157}
158