diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2005-09-18 12:44:27 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2005-09-18 12:44:27 +0000 |
commit | f5ec0fa592f9e23625de38673d22c4c7ee0fdfad (patch) | |
tree | 76915ace39025c5bcecaaef658622a25e5fd25f5 /apps/codecs/lib | |
parent | 59c995f58b52b1d41347ba4e81585423a29aa948 (diff) | |
download | rockbox-f5ec0fa592f9e23625de38673d22c4c7ee0fdfad.tar.gz rockbox-f5ec0fa592f9e23625de38673d22c4c7ee0fdfad.zip |
iriver: fix problem with playing some long vorbis files (e.g., this week in tech, #21); the decoder would run out of memory and freeze rockbox.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7526 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/lib')
-rw-r--r-- | apps/codecs/lib/codeclib.h | 6 | ||||
-rw-r--r-- | apps/codecs/lib/xxx2wav.c | 2 | ||||
-rw-r--r-- | apps/codecs/lib/xxx2wav.h | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h index 3fc03bd122..d6bbfd3888 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h | |||
@@ -28,9 +28,13 @@ extern unsigned char* mallocbuf; /* 512K from the start of MP3 buffer */ | |||
28 | 28 | ||
29 | void* codec_malloc(size_t size); | 29 | void* codec_malloc(size_t size); |
30 | void* codec_calloc(size_t nmemb, size_t size); | 30 | void* codec_calloc(size_t nmemb, size_t size); |
31 | void* codec_alloca(size_t size); | ||
32 | void* codec_realloc(void* ptr, size_t size); | 31 | void* codec_realloc(void* ptr, size_t size); |
33 | void codec_free(void* ptr); | 32 | void codec_free(void* ptr); |
33 | |||
34 | #if defined(SIMULATOR) | ||
35 | void* codec_alloca(size_t size); | ||
36 | #endif | ||
37 | |||
34 | void *memcpy(void *dest, const void *src, size_t n); | 38 | void *memcpy(void *dest, const void *src, size_t n); |
35 | void *memset(void *s, int c, size_t n); | 39 | void *memset(void *s, int c, size_t n); |
36 | int memcmp(const void *s1, const void *s2, size_t n); | 40 | int memcmp(const void *s1, const void *s2, size_t n); |
diff --git a/apps/codecs/lib/xxx2wav.c b/apps/codecs/lib/xxx2wav.c index cd09d32450..776b29acfd 100644 --- a/apps/codecs/lib/xxx2wav.c +++ b/apps/codecs/lib/xxx2wav.c | |||
@@ -56,12 +56,14 @@ void* codec_calloc(size_t nmemb, size_t size) | |||
56 | return(x); | 56 | return(x); |
57 | } | 57 | } |
58 | 58 | ||
59 | #if defined(SIMULATOR) | ||
59 | void* codec_alloca(size_t size) | 60 | void* codec_alloca(size_t size) |
60 | { | 61 | { |
61 | void* x; | 62 | void* x; |
62 | x = codec_malloc(size); | 63 | x = codec_malloc(size); |
63 | return(x); | 64 | return(x); |
64 | } | 65 | } |
66 | #endif | ||
65 | 67 | ||
66 | void codec_free(void* ptr) { | 68 | void codec_free(void* ptr) { |
67 | (void)ptr; | 69 | (void)ptr; |
diff --git a/apps/codecs/lib/xxx2wav.h b/apps/codecs/lib/xxx2wav.h index 2c9a73729c..e1e76078f2 100644 --- a/apps/codecs/lib/xxx2wav.h +++ b/apps/codecs/lib/xxx2wav.h | |||
@@ -46,9 +46,13 @@ extern unsigned char* filebuf; // The rest of the MP3 buffer | |||
46 | 46 | ||
47 | void* codec_malloc(size_t size); | 47 | void* codec_malloc(size_t size); |
48 | void* codec_calloc(size_t nmemb, size_t size); | 48 | void* codec_calloc(size_t nmemb, size_t size); |
49 | void* codec_alloca(size_t size); | ||
50 | void* codec_realloc(void* ptr, size_t size); | 49 | void* codec_realloc(void* ptr, size_t size); |
51 | void codec_free(void* ptr); | 50 | void codec_free(void* ptr); |
51 | |||
52 | #if defined(SIMULATOR) | ||
53 | void* codec_alloca(size_t size); | ||
54 | #endif | ||
55 | |||
52 | size_t strlen(const char *s); | 56 | size_t strlen(const char *s); |
53 | char *strcpy(char *dest, const char *src); | 57 | char *strcpy(char *dest, const char *src); |
54 | char *strcat(char *dest, const char *src); | 58 | char *strcat(char *dest, const char *src); |