diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-16 15:31:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-16 15:31:19 -0700 |
| commit | 7df98f17a42e47d8bc49891c370786ee3d3a1379 (patch) | |
| tree | 98a1c6adb462fb0b6d3d2f4353f37a06c5e1c68b /media/libstagefright/codecs | |
| parent | 1a42aee5e1e975158da4754f9bae46c945e27281 (diff) | |
| parent | 0df213babc4fb41b7daa05cb3c08071f2b60f6a5 (diff) | |
| download | frameworks_av-7df98f17a42e47d8bc49891c370786ee3d3a1379.zip frameworks_av-7df98f17a42e47d8bc49891c370786ee3d3a1379.tar.gz frameworks_av-7df98f17a42e47d8bc49891c370786ee3d3a1379.tar.bz2 | |
am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3"
* commit '0df213babc4fb41b7daa05cb3c08071f2b60f6a5':
hardening: eliminate text relocations from mp3
Diffstat (limited to 'media/libstagefright/codecs')
3 files changed, 9 insertions, 7 deletions
diff --git a/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s b/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s index f83732b..e61c8d3 100644 --- a/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s +++ b/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s @@ -369,7 +369,9 @@ pvmp3_merge_in_place_N32: pvmp3_split: stmfd sp!,{r4,r5,lr} - ldr r2,constant16 + adr r1,constant16 + ldr r2,[r1] + add r2,r1 sub r1,r0,#4 mov r3,#3 loop1: @@ -449,7 +451,7 @@ constant14: constant15: .word 0x5a827980 constant16: - .word CosTable_dct32 + 60 + .word (CosTable_dct32 + 60)-constant16 diff --git a/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s b/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s index 96230c5..575acd6 100644 --- a/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s +++ b/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s @@ -43,7 +43,7 @@ pvmp3_mdct_18: stmfd sp!,{r4-r11,lr} mov r7,r2 - ldr r2,table + adr r2,constdata$1 mov r6,r1 add r3,r2,#0x24 add r12,r3,#0x44 @@ -321,8 +321,6 @@ Loop_2: smull r2,r1,r0,r1 str r1,[r6,#0x3c] ldmfd sp!,{r4-r11,pc} -table: - .word constdata$1 @------------------------------------------------------------------------------ diff --git a/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s b/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s index 4f45737..b74c849 100644 --- a/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s +++ b/media/libstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s @@ -46,8 +46,10 @@ pvmp3_polyphase_filter_window: stmfd sp!,{r0-r2,r4-r11,lr} sub sp,sp,#4 + adr r2,PolyPh_filter_coeff + ldr r1,[r2] + add r1,r2 ldr r2,[sp,#0xc] - ldr r1,PolyPh_filter_coeff sub r2,r2,#1 mov r10,#1 @@ -224,7 +226,7 @@ PolyPh_filter_loop2: ldmfd sp!,{r4-r11,pc} PolyPh_filter_coeff: - .word pqmfSynthWin + .word pqmfSynthWin-PolyPh_filter_coeff LOW_16BITS: .word 0x00007fff |