diff options
| -rwxr-xr-x | build/make/ads2gas.pl | 2 | ||||
| -rwxr-xr-x | build/make/ads2gas_apple.pl | 14 | ||||
| -rw-r--r-- | vp9/common/arm/neon/vp9_reconintra_neon.asm | 16 | ||||
| -rw-r--r-- | vp9/common/vp9_pred_common.c | 40 |
4 files changed, 35 insertions, 37 deletions
diff --git a/build/make/ads2gas.pl b/build/make/ads2gas.pl index 9c4190129..7272424af 100755 --- a/build/make/ads2gas.pl +++ b/build/make/ads2gas.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ## ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## diff --git a/build/make/ads2gas_apple.pl b/build/make/ads2gas_apple.pl index befb3dbe7..a82f3eba8 100755 --- a/build/make/ads2gas_apple.pl +++ b/build/make/ads2gas_apple.pl @@ -75,16 +75,16 @@ while (<STDIN>) s/:SHR:/ >> /g; # Convert ELSE to .else - s/ELSE/.else/g; + s/\bELSE\b/.else/g; # Convert ENDIF to .endif - s/ENDIF/.endif/g; + s/\bENDIF\b/.endif/g; # Convert ELSEIF to .elseif - s/ELSEIF/.elseif/g; + s/\bELSEIF\b/.elseif/g; # Convert LTORG to .ltorg - s/LTORG/.ltorg/g; + s/\bLTORG\b/.ltorg/g; # Convert IF :DEF:to .if # gcc doesn't have the ability to do a conditional @@ -164,7 +164,7 @@ while (<STDIN>) s/^([a-zA-Z_0-9\$]+)/$1:/ if !/EQU/; # ALIGN directive - s/ALIGN/.balign/g; + s/\bALIGN\b/.balign/g; # Strip ARM s/\sARM/@ ARM/g; @@ -184,7 +184,7 @@ while (<STDIN>) s/(.*)EQU(.*)/.set $1, $2/; # Begin macro definition - if (/MACRO/) + if (/\bMACRO\b/) { # Process next line down, which will be the macro definition $_ = <STDIN>; @@ -215,7 +215,7 @@ while (<STDIN>) # For macros, use \ to reference formal params # s/\$/\\/g; # End macro definition - s/MEND/.endm/; # No need to tell it where to stop assembling + s/\bMEND\b/.endm/; # No need to tell it where to stop assembling next if /^\s*END\s*$/; # Clang used by Chromium differs slightly from clang in XCode in what it diff --git a/vp9/common/arm/neon/vp9_reconintra_neon.asm b/vp9/common/arm/neon/vp9_reconintra_neon.asm index 279f678b1..4a49964d5 100644 --- a/vp9/common/arm/neon/vp9_reconintra_neon.asm +++ b/vp9/common/arm/neon/vp9_reconintra_neon.asm @@ -349,7 +349,7 @@ loop_h vdup.u8 d0, r12 ; preload 8 left - vld1.8 d30, [r3] + vld1.8 {d30}, [r3] ; Load above 8 pixels vld1.64 {d2}, [r2] @@ -422,10 +422,10 @@ loop_h vdup.u8 q0, r12 ; Load above 8 pixels - vld1.8 q1, [r2] + vld1.8 {q1}, [r2] ; preload 8 left into r12 - vld1.8 d18, [r3]! + vld1.8 {d18}, [r3]! ; Compute above - ytop_left vsubl.u8 q2, d2, d0 @@ -492,7 +492,7 @@ loop_16x16_neon vqshrun.s16 d23, q8, #0 vdup.16 q0, d20[2] vdup.16 q8, d20[3] - vld1.8 d18, [r3]! ; preload 8 left into r12 + vld1.8 {d18}, [r3]! ; preload 8 left into r12 vmovl.u8 q10, d18 vst1.64 {d2,d3}, [r0], r1 vst1.64 {d22,d23}, [r0], r1 @@ -518,11 +518,11 @@ loop_16x16_neon vdup.u8 q0, r12 ; Load above 32 pixels - vld1.8 q1, [r2]! - vld1.8 q2, [r2] + vld1.8 {q1}, [r2]! + vld1.8 {q2}, [r2] ; preload 8 left pixels - vld1.8 d26, [r3]! + vld1.8 {d26}, [r3]! ; Compute above - ytop_left vsubl.u8 q8, d2, d0 @@ -621,7 +621,7 @@ loop_32x32_neon vst1.64 {d0-d3}, [r0], r1 vqshrun.s16 d24, q12, #0 vqshrun.s16 d25, q13, #0 - vld1.8 d0, [r3]! ; preload 8 left pixels + vld1.8 {d0}, [r3]! ; preload 8 left pixels vqshrun.s16 d26, q14, #0 vqshrun.s16 d27, q15, #0 vmovl.u8 q3, d0 diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index 11b6d93c1..d5c27a5dc 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -291,23 +291,23 @@ int vp9_get_pred_context_single_ref_p2(const MACROBLOCKD *xd) { } else { // inter/inter const int above_has_second = has_second_ref(above_mbmi); const int left_has_second = has_second_ref(left_mbmi); + const MV_REFERENCE_FRAME above0 = above_mbmi->ref_frame[0]; + const MV_REFERENCE_FRAME above1 = above_mbmi->ref_frame[1]; + const MV_REFERENCE_FRAME left0 = left_mbmi->ref_frame[0]; + const MV_REFERENCE_FRAME left1 = left_mbmi->ref_frame[1]; if (above_has_second && left_has_second) { - if (above_mbmi->ref_frame[0] == left_mbmi->ref_frame[0] && - above_mbmi->ref_frame[1] == left_mbmi->ref_frame[1]) - pred_context = 3 * (above_mbmi->ref_frame[0] == GOLDEN_FRAME || - above_mbmi->ref_frame[1] == GOLDEN_FRAME || - left_mbmi->ref_frame[0] == GOLDEN_FRAME || - left_mbmi->ref_frame[1] == GOLDEN_FRAME); + if (above0 == left0 && above1 == left1) + pred_context = 3 * (above0 == GOLDEN_FRAME || + above1 == GOLDEN_FRAME || + left0 == GOLDEN_FRAME || + left1 == GOLDEN_FRAME); else pred_context = 2; } else if (above_has_second || left_has_second) { - const MV_REFERENCE_FRAME rfs = !above_has_second ? - above_mbmi->ref_frame[0] : left_mbmi->ref_frame[0]; - const MV_REFERENCE_FRAME crf1 = above_has_second ? - above_mbmi->ref_frame[0] : left_mbmi->ref_frame[0]; - const MV_REFERENCE_FRAME crf2 = above_has_second ? - above_mbmi->ref_frame[1] : left_mbmi->ref_frame[1]; + const MV_REFERENCE_FRAME rfs = !above_has_second ? above0 : left0; + const MV_REFERENCE_FRAME crf1 = above_has_second ? above0 : left0; + const MV_REFERENCE_FRAME crf2 = above_has_second ? above1 : left1; if (rfs == GOLDEN_FRAME) pred_context = 3 + (crf1 == GOLDEN_FRAME || crf2 == GOLDEN_FRAME); @@ -316,17 +316,15 @@ int vp9_get_pred_context_single_ref_p2(const MACROBLOCKD *xd) { else pred_context = 1 + 2 * (crf1 == GOLDEN_FRAME || crf2 == GOLDEN_FRAME); } else { - if (above_mbmi->ref_frame[0] == LAST_FRAME && - left_mbmi->ref_frame[0] == LAST_FRAME) { + if (above0 == LAST_FRAME && left0 == LAST_FRAME) { pred_context = 3; - } else if (above_mbmi->ref_frame[0] == LAST_FRAME || - left_mbmi->ref_frame[0] == LAST_FRAME) { - const MB_MODE_INFO *edge_mbmi = - above_mbmi->ref_frame[0] == LAST_FRAME ? left_mbmi : above_mbmi; - pred_context = 4 * (edge_mbmi->ref_frame[0] == GOLDEN_FRAME); + } else if (above0 == LAST_FRAME || left0 == LAST_FRAME) { + const MV_REFERENCE_FRAME edge0 = (above0 == LAST_FRAME) ? left0 + : above0; + pred_context = 4 * (edge0 == GOLDEN_FRAME); } else { - pred_context = 2 * (above_mbmi->ref_frame[0] == GOLDEN_FRAME) + - 2 * (left_mbmi->ref_frame[0] == GOLDEN_FRAME); + pred_context = 2 * (above0 == GOLDEN_FRAME) + + 2 * (left0 == GOLDEN_FRAME); } } } |