diff options
| author | Nils Wallménius <nils@rockbox.org> | 2010-07-17 08:33:36 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2010-07-17 08:33:36 +0000 |
| commit | d6446d0b08c62c7258793603f4cc7c027b0043a1 (patch) | |
| tree | 2240abd91d74bed20bb66420039889d46e9b92b8 /apps | |
| parent | 53d13a8e76adb93ea33b1715257ab467f9f05b13 (diff) | |
| download | rockbox-d6446d0b08c62c7258793603f4cc7c027b0043a1.tar.gz rockbox-d6446d0b08c62c7258793603f4cc7c027b0043a1.zip | |
Begin shoehorning wma into the clip codec buffer again. Reduce the static buffer used by init_vlc so that it is no larger than is needed. Make the VLCcode struct packed to save space.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27457 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/codecs/lib/ffmpeg_bitstream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/codecs/lib/ffmpeg_bitstream.c b/apps/codecs/lib/ffmpeg_bitstream.c index 542f2671e5..e16df8dcce 100644 --- a/apps/codecs/lib/ffmpeg_bitstream.c +++ b/apps/codecs/lib/ffmpeg_bitstream.c | |||
| @@ -146,7 +146,7 @@ typedef struct { | |||
| 146 | /** codeword, with the first bit-to-be-read in the msb | 146 | /** codeword, with the first bit-to-be-read in the msb |
| 147 | * (even if intended for a little-endian bitstream reader) */ | 147 | * (even if intended for a little-endian bitstream reader) */ |
| 148 | uint32_t code; | 148 | uint32_t code; |
| 149 | } VLCcode; | 149 | } __attribute__((__packed__)) VLCcode; /* packed to save space */ |
| 150 | 150 | ||
| 151 | static int compare_vlcspec(const void *a, const void *b) | 151 | static int compare_vlcspec(const void *a, const void *b) |
| 152 | { | 152 | { |
| @@ -291,7 +291,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, | |||
| 291 | out above (bitswap_32) and an inline asm version in libtremor/codebook.c | 291 | out above (bitswap_32) and an inline asm version in libtremor/codebook.c |
| 292 | if we ever want this */ | 292 | if we ever want this */ |
| 293 | 293 | ||
| 294 | static VLCcode buf[1500]; /* worst case is wma, which has one table with 1336 entries */ | 294 | static VLCcode buf[1336+1]; /* worst case is wma, which has one table with 1336 entries */ |
| 295 | 295 | ||
| 296 | int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, | 296 | int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, |
| 297 | const void *bits, int bits_wrap, int bits_size, | 297 | const void *bits, int bits_wrap, int bits_size, |