libvpx: Pull from upstream

source/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm

 ;
 ;  Copyright (c) 2011 The WebM project authors. All Rights Reserved.
 ;
 ;  Use of this source code is governed by a BSD-style license
 ;  that can be found in the LICENSE file in the root of the source
 ;  tree. An additional intellectual property rights grant can be found
 ;  in the file PATENTS.  All contributing project authors may
 ;  be found in the AUTHORS file in the root of the source tree.
 ;
 
@@ skipping 51 matching lines @@
     usub8   r6, r5, r4          ; calculate difference with reversed operands
     pld     [r2, r3, lsl #1]
     sel     r6, r6, lr          ; select bytes with negative difference
 
     ; calculate partial sums
     usad8   r4, r7, lr          ; calculate sum of positive differences
     usad8   r5, r6, lr          ; calculate sum of negative differences
     orr     r6, r6, r7          ; differences of all 4 pixels
     ; calculate total sum
     adds    r8, r8, r4          ; add positive differences to sum
-    subs    r8, r8, r5          ; substract negative differences from sum
+    subs    r8, r8, r5          ; subtract negative differences from sum
 
     ; calculate sse
     uxtb16  r5, r6              ; byte (two pixels) to halfwords
     uxtb16  r7, r6, ror #8      ; another two pixels to halfwords
     smlad   r11, r5, r5, r11    ; dual signed multiply, add and accumulate (1)
 
     ; 2nd 4 pixels
     ldr     r4, [r0, #4]        ; load source pixels a, row N
     ldr     r6, [r0, #5]        ; load source pixels b, row N
     ldr     r5, [r9, #4]        ; load source pixels c, row N+1
@@ skipping 21 matching lines @@
     usub8   r6, r5, r4          ; calculate difference with reversed operands
     sel     r6, r6, lr          ; select bytes with negative difference
 
     ; calculate partial sums
     usad8   r4, r7, lr          ; calculate sum of positive differences
     usad8   r5, r6, lr          ; calculate sum of negative differences
     orr     r6, r6, r7          ; differences of all 4 pixels
 
     ; calculate total sum
     add     r8, r8, r4          ; add positive differences to sum
-    sub     r8, r8, r5          ; substract negative differences from sum
+    sub     r8, r8, r5          ; subtract negative differences from sum
 
     ; calculate sse
     uxtb16  r5, r6              ; byte (two pixels) to halfwords
     uxtb16  r7, r6, ror #8      ; another two pixels to halfwords
     smlad   r11, r5, r5, r11    ; dual signed multiply, add and accumulate (1)
 
     ; 3rd 4 pixels
     ldr     r4, [r0, #8]        ; load source pixels a, row N
     ldr     r6, [r0, #9]        ; load source pixels b, row N
     ldr     r5, [r9, #8]        ; load source pixels c, row N+1
@@ skipping 21 matching lines @@
     usub8   r6, r5, r4          ; calculate difference with reversed operands
     sel     r6, r6, lr          ; select bytes with negative difference
 
     ; calculate partial sums
     usad8   r4, r7, lr          ; calculate sum of positive differences
     usad8   r5, r6, lr          ; calculate sum of negative differences
     orr     r6, r6, r7          ; differences of all 4 pixels
 
     ; calculate total sum
     add     r8, r8, r4          ; add positive differences to sum
-    sub     r8, r8, r5          ; substract negative differences from sum
+    sub     r8, r8, r5          ; subtract negative differences from sum
 
     ; calculate sse
     uxtb16  r5, r6              ; byte (two pixels) to halfwords
     uxtb16  r7, r6, ror #8      ; another two pixels to halfwords
     smlad   r11, r5, r5, r11    ; dual signed multiply, add and accumulate (1)
 
     ; 4th 4 pixels
     ldr     r4, [r0, #12]       ; load source pixels a, row N
     ldr     r6, [r0, #13]       ; load source pixels b, row N
     ldr     r5, [r9, #12]       ; load source pixels c, row N+1
@@ skipping 21 matching lines @@
     add     r2, r2, r3          ; set dst_ptr to next row
     sel     r6, r6, lr          ; select bytes with negative difference
 
     ; calculate partial sums
     usad8   r4, r7, lr          ; calculate sum of positive differences
     usad8   r5, r6, lr          ; calculate sum of negative differences
     orr     r6, r6, r7          ; differences of all 4 pixels
 
     ; calculate total sum
     add     r8, r8, r4          ; add positive differences to sum
-    sub     r8, r8, r5          ; substract negative differences from sum
+    sub     r8, r8, r5          ; subtract negative differences from sum
 
     ; calculate sse
     uxtb16  r5, r6              ; byte (two pixels) to halfwords
     uxtb16  r7, r6, ror #8      ; another two pixels to halfwords
     smlad   r11, r5, r5, r11    ; dual signed multiply, add and accumulate (1)
     subs    r12, r12, #1
     smlad   r11, r7, r7, r11    ; dual signed multiply, add and accumulate (2)
 
     bne     loop
 
     ; return stuff
     ldr     r6, [sp, #40]       ; get address of sse
     mul     r0, r8, r8          ; sum * sum
     str     r11, [r6]           ; store sse
     sub     r0, r11, r0, lsr #8 ; return (sse - ((sum * sum) >> 8))
 
     ldmfd   sp!, {r4-r12, pc}
 
     ENDP
 
 c80808080
     DCD     0x80808080
 
     END