highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'

Browse Source 
* commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c':
  simple_idct: arm: Drop disabled code variant

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch
2017-03-19 16:12:07 +01:00
parent 8695ce73ca 014852e932
commit a754fae4a7
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/arm/simple_idct_armv5te.S
View File

@@ -148,12 +148,6 @@ endfunc
ldr a4, [a1] /* a4 = col[1:0] */ ldr a4, [a1] /* a4 = col[1:0] */
mov ip, #16384 mov ip, #16384
sub ip, ip, #1 /* ip = W4 */ sub ip, ip, #1 /* ip = W4 */
#if 0
mov v1, #(1<<(COL_SHIFT-1))
smlabt v2, ip, a4, v1 /* v2 = W4*col[1] + (1<<(COL_SHIFT-1)) */
smlabb v1, ip, a4, v1 /* v1 = W4*col[0] + (1<<(COL_SHIFT-1)) */
ldr a4, [a1, #(16*4)]
#else
mov v1, #((1<<(COL_SHIFT-1))/W4) /* this matches the C version */ mov v1, #((1<<(COL_SHIFT-1))/W4) /* this matches the C version */
add v2, v1, a4, asr #16 add v2, v1, a4, asr #16
rsb v2, v2, v2, lsl #14 rsb v2, v2, v2, lsl #14
@@ -161,7 +155,6 @@ endfunc
add v1, v1, a4, asr #16 add v1, v1, a4, asr #16
ldr a4, [a1, #(16*4)] ldr a4, [a1, #(16*4)]
rsb v1, v1, v1, lsl #14 rsb v1, v1, v1, lsl #14
#endif
smulbb lr, ip, a4 smulbb lr, ip, a4
smulbt a3, ip, a4 smulbt a3, ip, a4