diff options
| author | Andreas Huber <andih@google.com> | 2010-10-08 08:17:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-08 08:17:54 -0700 |
| commit | 4b43c1f169ab29b2d4dd058573668f7f4ffb8ca1 (patch) | |
| tree | 8846045a48cee8a846bb8e830a0e5975d817772d /media | |
| parent | fbc504d6a8ec1204b5fa203924f8324ff4aa0e74 (diff) | |
| parent | f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c (diff) | |
| download | frameworks_av-4b43c1f169ab29b2d4dd058573668f7f4ffb8ca1.zip frameworks_av-4b43c1f169ab29b2d4dd058573668f7f4ffb8ca1.tar.gz frameworks_av-4b43c1f169ab29b2d4dd058573668f7f4ffb8ca1.tar.bz2 | |
am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread
Merge commit 'bb245d35b6e81d750a91815543973b0a5976352b' into gingerbread-plus-aosp
* commit 'bb245d35b6e81d750a91815543973b0a5976352b':
Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
Diffstat (limited to 'media')
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; |