diff options
| author | Andreas Huber <andih@google.com> | 2010-10-07 16:48:50 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-10-07 16:52:42 -0700 |
| commit | f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c (patch) | |
| tree | 8f0773e9d8a4cee272ec1efbdd6dfa41679af9d3 | |
| parent | 2a4d22d79e927f2245537921e10fc5fda1c47a29 (diff) | |
| download | frameworks_av-f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c.zip frameworks_av-f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c.tar.gz frameworks_av-f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c.tar.bz2 | |
Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
Change-Id: I5a637f1b380e44c94040ec507843d58a1f5a9b61
related-to-bug: 3065605
3 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp b/media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp index 35b6475..286c636 100644 --- a/media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp +++ b/media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp @@ -40,7 +40,7 @@ int32 xr[ ], rescaled data struct gr_info_s *gr_info, granule structure mp3Header *info, mp3 header info - int32 Scratch_mem[168] for temporary usage + int32 Scratch_mem[198] for temporary usage Outputs: @@ -120,7 +120,7 @@ void pvmp3_reorder(int32 xr[SUBBANDS_NUMBER*FILTERBANK_BANDS], granuleInfo *gr_info, int32 *used_freq_lines, mp3Header *info, - int32 Scratch_mem[168]) + int32 Scratch_mem[198]) { int32 sfreq = info->version_x + (info->version_x << 1); sfreq += info->sampling_frequency; diff --git a/media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.h b/media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.h index ba6ec16..5248951 100644 --- a/media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.h +++ b/media/libstagefright/codecs/mp3dec/src/pvmp3_reorder.h @@ -89,7 +89,7 @@ extern "C" granuleInfo *gr_info, int32 *used_freq_lines, mp3Header *info, - int32 Scratch_mem[168]); + int32 Scratch_mem[198]); #ifdef __cplusplus } diff --git a/media/libstagefright/codecs/mp3dec/src/s_tmp3dec_file.h b/media/libstagefright/codecs/mp3dec/src/s_tmp3dec_file.h index 805cedb..611e08f 100644 --- a/media/libstagefright/codecs/mp3dec/src/s_tmp3dec_file.h +++ b/media/libstagefright/codecs/mp3dec/src/s_tmp3dec_file.h @@ -87,7 +87,7 @@ extern "C" int32 num_channels; int32 predicted_frame_size; int32 frame_start; - int32 Scratch_mem[168]; + int32 Scratch_mem[198]; tmp3dec_chan perChan[CHAN]; mp3ScaleFactors scaleFactors[CHAN]; mp3SideInfo sideInfo; |