History

Fix building svc_motion_estimation.S for android

The .align directive takes an argument in number of bits, i.e. the actual alignment is 2^n. Previously building with binutils failed, since 16 isn't a valid parameter to .align, the maximum is 15. Thus, this makes the code try to align to 16 bytes, instead of aligning to 65536 bytes. This fixes building for android. This also clears up the same mistake in the aarch64 code, even though that one built just fine.

Martin Storsjö committed 12 years ago

Commit 81ac3d21 parent 464244c5 files · +7 −7Browse files

Showing the changes to codec/decoder (1 of 5 files). Show all

Unified · Split

codec/decoder/core/arm64/intra_pred_aarch64_neon.S+2−2
@@ -308,7 +308,7 @@ WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderIChromaPredDcTop_AArch64_neon · 307 unmodified lines
308.endr308.endr
309WELS_ASM_AARCH64_FUNC_END309WELS_ASM_AARCH64_FUNC_END
310 310
311.align 16311.align 4
312intra_1_to_4: .short 17*1, 17*2, 17*3, 17*4, 17*1, 17*2, 17*3, 17*4312intra_1_to_4: .short 17*1, 17*2, 17*3, 17*4, 17*1, 17*2, 17*3, 17*4
313intra_m3_to_p4: .short -3, -2, -1, 0, 1, 2, 3, 4313intra_m3_to_p4: .short -3, -2, -1, 0, 1, 2, 3, 4
314 314
@@ -457,7 +457,7 @@ WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI16x16LumaPredDcLeft_AArch64_neon · 142 unmodified lines
457WELS_ASM_AARCH64_FUNC_END457WELS_ASM_AARCH64_FUNC_END
458 458
459 459
460.align 16460.align 4
461intra_1_to_8: .short 5, 10, 15, 20, 25, 30, 35, 40461intra_1_to_8: .short 5, 10, 15, 20, 25, 30, 35, 40
462intra_m7_to_p8: .short -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8462intra_m7_to_p8: .short -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8
463 463

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t