Skip to content

Revert^2 "libavc: Add BTI and PAC support in libavc" #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harishdm merged 1 commit into from
Apr 10, 2026
Merged

Revert^2 "libavc: Add BTI and PAC support in libavc" #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ cc_library_static {
name: "libavcdec",
defaults: [
"libavc_dec_defaults",
"no_bti",
],

export_include_dirs: [
Expand Down
15 changes: 9 additions & 6 deletions common/armv8/ih264_deblk_chroma_av8.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@
///*****************************************************************************/


.text
.p2align 2
.include "ih264_neon_macros.s"
.text

///**
//*******************************************************************************
Expand Down Expand Up @@ -82,7 +81,7 @@

.global ih264_deblk_chroma_horz_bs4_av8

ih264_deblk_chroma_horz_bs4_av8:
ENTRY ih264_deblk_chroma_horz_bs4_av8

// STMFD sp!,{x4-x6,x14} //
push_v_regs
Expand Down Expand Up @@ -138,6 +137,7 @@ ih264_deblk_chroma_horz_bs4_av8:
// LDMFD sp!,{x4-x6,pc} //
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -182,7 +182,7 @@ ih264_deblk_chroma_horz_bs4_av8:

.global ih264_deblk_chroma_vert_bs4_av8

ih264_deblk_chroma_vert_bs4_av8:
ENTRY ih264_deblk_chroma_vert_bs4_av8

// STMFD sp!,{x4,x5,x12,x14}
push_v_regs
Expand Down Expand Up @@ -276,6 +276,7 @@ ih264_deblk_chroma_vert_bs4_av8:
// LDMFD sp!,{x4,x5,x12,pc}
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -329,7 +330,7 @@ ih264_deblk_chroma_vert_bs4_av8:

.global ih264_deblk_chroma_horz_bslt4_av8

ih264_deblk_chroma_horz_bslt4_av8:
ENTRY ih264_deblk_chroma_horz_bslt4_av8

// STMFD sp!,{x4-x9,x14} //
push_v_regs
Expand Down Expand Up @@ -410,6 +411,7 @@ ih264_deblk_chroma_horz_bslt4_av8:

ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -464,7 +466,7 @@ ih264_deblk_chroma_horz_bslt4_av8:

.global ih264_deblk_chroma_vert_bslt4_av8

ih264_deblk_chroma_vert_bslt4_av8:
ENTRY ih264_deblk_chroma_vert_bslt4_av8

// STMFD sp!,{x4-x7,x10-x12,x14}
push_v_regs
Expand Down Expand Up @@ -582,6 +584,7 @@ ih264_deblk_chroma_vert_bslt4_av8:

ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


15 changes: 9 additions & 6 deletions common/armv8/ih264_deblk_luma_av8.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@
///*****************************************************************************/


.text
.p2align 2
.include "ih264_neon_macros.s"
.text



Expand Down Expand Up @@ -86,7 +85,7 @@

.global ih264_deblk_luma_horz_bslt4_av8

ih264_deblk_luma_horz_bslt4_av8:
ENTRY ih264_deblk_luma_horz_bslt4_av8

// STMFD sp!,{x4-x7,x14}
push_v_regs
Expand Down Expand Up @@ -197,6 +196,7 @@ ih264_deblk_luma_horz_bslt4_av8:
// LDMFD sp!,{x4-x7,pc}
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -235,7 +235,7 @@ ih264_deblk_luma_horz_bslt4_av8:

.global ih264_deblk_luma_horz_bs4_av8

ih264_deblk_luma_horz_bs4_av8:
ENTRY ih264_deblk_luma_horz_bs4_av8

// Back up necessary registers on stack
// STMFD sp!,{x12,x14}
Expand Down Expand Up @@ -385,6 +385,7 @@ ih264_deblk_luma_horz_bs4_av8:
// LDMFD sp!,{x12,pc}
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -429,7 +430,7 @@ ih264_deblk_luma_horz_bs4_av8:

.global ih264_deblk_luma_vert_bslt4_av8

ih264_deblk_luma_vert_bslt4_av8:
ENTRY ih264_deblk_luma_vert_bslt4_av8

// STMFD sp!,{x12,x14}
push_v_regs
Expand Down Expand Up @@ -728,6 +729,7 @@ ih264_deblk_luma_vert_bslt4_av8:
// LDMFD sp!,{x12,pc}
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -766,7 +768,7 @@ ih264_deblk_luma_vert_bslt4_av8:

.global ih264_deblk_luma_vert_bs4_av8

ih264_deblk_luma_vert_bs4_av8:
ENTRY ih264_deblk_luma_vert_bs4_av8

// STMFD sp!,{x12,x14}
push_v_regs
Expand Down Expand Up @@ -1082,6 +1084,7 @@ ih264_deblk_luma_vert_bs4_av8:
// LDMFD sp!,{x12,pc}
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


9 changes: 5 additions & 4 deletions common/armv8/ih264_default_weighted_pred_av8.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,14 @@
// w6 => ht
// w7 => wd
//
.text
.p2align 2
.include "ih264_neon_macros.s"
.text



.global ih264_default_weighted_pred_luma_av8

ih264_default_weighted_pred_luma_av8:
ENTRY ih264_default_weighted_pred_luma_av8

push_v_regs
stp x19, x20, [sp, #-16]!
Expand Down Expand Up @@ -213,6 +212,7 @@ end_loops:
// LDMFD sp!,{x4-x7,x15} //Reload the registers from sp
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -285,7 +285,7 @@ end_loops:

.global ih264_default_weighted_pred_chroma_av8

ih264_default_weighted_pred_chroma_av8:
ENTRY ih264_default_weighted_pred_chroma_av8

push_v_regs
stp x19, x20, [sp, #-16]!
Expand Down Expand Up @@ -352,6 +352,7 @@ loop_8_uv: //each iteration processes four rows
end_loops_uv:
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down
7 changes: 4 additions & 3 deletions common/armv8/ih264_ihadamard_scaling_av8.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,9 @@
//x4=> u4_qp_div_6

.text
.p2align 2

.global ih264_ihadamard_scaling_4x4_av8
ih264_ihadamard_scaling_4x4_av8:
ENTRY ih264_ihadamard_scaling_4x4_av8

//only one shift is done in horizontal inverse because,
//if u4_qp_div_6 is lesser than 4 then shift value will be neagative and do negative left shift, in this case rnd_factor has value
Expand Down Expand Up @@ -159,6 +158,7 @@ ih264_ihadamard_scaling_4x4_av8:
st1 {v0.4h-v3.4h}, [x1] //store the result

pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -202,7 +202,7 @@ ih264_ihadamard_scaling_4x4_av8:
// UWORD32 u4_qp_div_6,

.global ih264_ihadamard_scaling_2x2_uv_av8
ih264_ihadamard_scaling_2x2_uv_av8:
ENTRY ih264_ihadamard_scaling_2x2_uv_av8

//Registers used
// x0 : *pi2_src
Expand Down Expand Up @@ -244,6 +244,7 @@ ih264_ihadamard_scaling_2x2_uv_av8:

st2 {v0.4s-v1.4s}, [x1]
pop_v_regs
EXIT_FUNC
ret


Expand Down
6 changes: 3 additions & 3 deletions common/armv8/ih264_inter_pred_chroma_av8.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,14 @@
// w6 => height
// w7 => width
//
.text
.p2align 2
.include "ih264_neon_macros.s"
.text



.global ih264_inter_pred_chroma_av8

ih264_inter_pred_chroma_av8:
ENTRY ih264_inter_pred_chroma_av8



Expand Down Expand Up @@ -393,6 +392,7 @@ end_func:
// LDMFD sp!,{x4-x12,PC} //Restoring registers from stack
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


6 changes: 3 additions & 3 deletions common/armv8/ih264_inter_pred_filters_luma_horz_av8.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,15 @@
// w4 => ht
// w5 => wd

.text
.p2align 2

.include "ih264_neon_macros.s"
.text



.global ih264_inter_pred_luma_horz_av8

ih264_inter_pred_luma_horz_av8:
ENTRY ih264_inter_pred_luma_horz_av8



Expand Down Expand Up @@ -528,6 +527,7 @@ end_func:
// LDMFD sp!,{x4-x12,PC} //Restoring registers from stack
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down
6 changes: 3 additions & 3 deletions common/armv8/ih264_inter_pred_filters_luma_vert_av8.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,15 @@
// w4 => ht
// w5 => wd

.text
.p2align 2
.include "ih264_neon_macros.s"
.text




.global ih264_inter_pred_luma_vert_av8

ih264_inter_pred_luma_vert_av8:
ENTRY ih264_inter_pred_luma_vert_av8

// STMFD sp!, {x4-x12, x14} //store register values to stack
push_v_regs
Expand Down Expand Up @@ -450,6 +449,7 @@ end_func:
// LDMFD sp!,{x4-x12,PC} //Restoring registers from stack
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down
11 changes: 7 additions & 4 deletions common/armv8/ih264_inter_pred_luma_copy_av8.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,14 @@
// w4 => ht
// w5 => wd

.text
.p2align 2
.include "ih264_neon_macros.s"
.text



.global ih264_inter_pred_luma_copy_av8

ih264_inter_pred_luma_copy_av8:
ENTRY ih264_inter_pred_luma_copy_av8

push_v_regs
stp x19, x20, [sp, #-16]!
Expand Down Expand Up @@ -128,6 +127,7 @@ end_loops:
// LDMFD sp!,{x4-x12,x15} //Reload the registers from SP
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -161,6 +161,7 @@ end_inner_loop_wd_8:
// LDMFD sp!,{x4-x12,x15} //Reload the registers from SP
ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret

core_loop_wd_16:
Expand Down Expand Up @@ -193,6 +194,7 @@ end_inner_loop_wd_16:

ldp x19, x20, [sp], #16
pop_v_regs
EXIT_FUNC
ret


Expand Down Expand Up @@ -238,7 +240,7 @@ end_inner_loop_wd_16:
// No need for pushing arm and neon registers

.global ih264_interleave_copy_av8
ih264_interleave_copy_av8:
ENTRY ih264_interleave_copy_av8
push_v_regs
sxtw x2, w2
sxtw x3, w3
Expand Down Expand Up @@ -268,6 +270,7 @@ ih264_interleave_copy_av8:
st1 {v20.d}[1], [x0], x3

pop_v_regs
EXIT_FUNC
ret


Loading
Loading