diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-12 04:11:13 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-12 04:11:13 +0000 |
commit | f52454f858828fddd6b45b478ed4081dadcc8ac4 (patch) | |
tree | 52bee5401e30791336aae16140f921677a1db4f7 | |
parent | a3c02a0ad84c32b97b99a3b14315b350dc5f3be8 (diff) | |
parent | 71160227f1330c4bec12e527bf920d330912f39d (diff) | |
download | libopus-f52454f858828fddd6b45b478ed4081dadcc8ac4.tar.gz |
Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018, 8558886, 8558887, 8558888, 8558889, 8558071, 8558072, 8556231] into qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release
Change-Id: I765da6de3bf2599f7804361c2be393c05cfac1e5
-rw-r--r-- | libopus_blacklist.txt | 20 | ||||
-rw-r--r-- | silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/libopus_blacklist.txt b/libopus_blacklist.txt index a789961e..fd3f398d 100644 --- a/libopus_blacklist.txt +++ b/libopus_blacklist.txt @@ -23,6 +23,26 @@ fun:ec_decode_bin src:*/celt/kiss_fft.c +# assembly optimizations that know what they are doing +fun:silk_SMULWB_armv4 +fun:silk_SMULWT_armv4 +fun:silk_SMULWW_armv4 +fun:silk_SMLAWW_armv4 +# +fun:silk_SMULWB_armv5e +fun:silk_SMLAWB_armv5e +fun:silk_SMULWT_armv5e +fun:silk_SMLAWT_armv5e +fun:silk_SMULBB_armv5e +fun:silk_SMLABB_armv5e +fun:silk_SMULBT_armv5e +fun:silk_SMLABT_armv5e +fun:silk_ADD_SAT32_armv5e +fun:silk_SUB_SAT32_armv5e +fun:silk_CLZ16_armv5 +fun:silk_CLZ32_armv5 + + # Performance related fun:exp_rotation1 fun:haar1 diff --git a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c index 00a70cb5..ee06f986 100644 --- a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c +++ b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c @@ -172,7 +172,7 @@ void silk_warped_autocorrelation_FIX_neon( state_QS_s32x4[ 0 ][ 1 ] = calc_state( state_QS_s32x4[ 0 ][ 1 ], state_QS_s32x4[ 2 ][ 1 ], state_QS_s32x4[ 1 ][ 1 ], warping_Q16_s32x4 ); state_QS_s32x4[ 1 ][ 0 ] = state_QS_s32x4[ 2 ][ 0 ]; state_QS_s32x4[ 1 ][ 1 ] = state_QS_s32x4[ 2 ][ 1 ]; - } while( ++n < ( length + order ) ); + } while( ++n < ( length + order - 3) ); in = state; o -= 8; } while( o > 4 ); |