drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread

Browse Source
This commit is contained in:
Andreas Huber
2010-10-08 08:02:42 -07:00
committed by Android (Google) Code Review
parent 44b7ef5408 3418835893
commit bb245d35b6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp
View File

@ -40,7 +40,7 @@
int32 xr[ ], rescaled data int32 xr[ ], rescaled data
struct gr_info_s *gr_info, granule structure struct gr_info_s *gr_info, granule structure
mp3Header *info, mp3 header info mp3Header *info, mp3 header info
int32 Scratch_mem[168] for temporary usage int32 Scratch_mem[198] for temporary usage
Outputs: Outputs:
@ -120,7 +120,7 @@ void pvmp3_reorder(int32 xr[SUBBANDS_NUMBER*FILTERBANK_BANDS],
granuleInfo *gr_info, granuleInfo *gr_info,
int32 *used_freq_lines, int32 *used_freq_lines,
mp3Header *info, mp3Header *info,
int32 Scratch_mem[168]) int32 Scratch_mem[198])
{ {
int32 sfreq = info->version_x + (info->version_x << 1); int32 sfreq = info->version_x + (info->version_x << 1);
sfreq += info->sampling_frequency; sfreq += info->sampling_frequency;

2
media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.h
View File

@ -89,7 +89,7 @@ extern "C"
granuleInfo *gr_info, granuleInfo *gr_info,
int32 *used_freq_lines, int32 *used_freq_lines,
mp3Header *info, mp3Header *info,
int32 Scratch_mem[168]); int32 Scratch_mem[198]);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
media/libstagefright/codecs/mp3dec/src/s_tmp3dec_file.h
View File

@ -87,7 +87,7 @@ extern "C"
int32 num_channels; int32 num_channels;
int32 predicted_frame_size; int32 predicted_frame_size;
int32 frame_start; int32 frame_start;
int32 Scratch_mem[168]; int32 Scratch_mem[198];
tmp3dec_chan perChan[CHAN]; tmp3dec_chan perChan[CHAN];
mp3ScaleFactors scaleFactors[CHAN]; mp3ScaleFactors scaleFactors[CHAN];
mp3SideInfo sideInfo; mp3SideInfo sideInfo;