diff --git a/dependencies/ih264d/common/armv8/ih264_intra_pred_chroma_av8.s b/dependencies/ih264d/common/armv8/ih264_intra_pred_chroma_av8.s index fa4c07c5..c0d9cf99 100644 --- a/dependencies/ih264d/common/armv8/ih264_intra_pred_chroma_av8.s +++ b/dependencies/ih264d/common/armv8/ih264_intra_pred_chroma_av8.s @@ -53,13 +53,10 @@ .text .p2align 2 .include "ih264_neon_macros.s" -#ifdef __APPLE__ -.extern _ih264_gai1_intrapred_chroma_plane_coeffs1 -.extern _ih264_gai1_intrapred_chroma_plane_coeffs2 -#else + .extern ih264_gai1_intrapred_chroma_plane_coeffs1 .extern ih264_gai1_intrapred_chroma_plane_coeffs2 -#endif + ///** diff --git a/dependencies/ih264d/common/armv8/ih264_intra_pred_luma_16x16_av8.s b/dependencies/ih264d/common/armv8/ih264_intra_pred_luma_16x16_av8.s index 4d45e5af..e564b334 100644 --- a/dependencies/ih264d/common/armv8/ih264_intra_pred_luma_16x16_av8.s +++ b/dependencies/ih264d/common/armv8/ih264_intra_pred_luma_16x16_av8.s @@ -53,11 +53,7 @@ .text .p2align 2 .include "ih264_neon_macros.s" -#ifdef __APPLE__ -.extern _ih264_gai1_intrapred_luma_plane_coeffs -#else .extern ih264_gai1_intrapred_luma_plane_coeffs -#endif @@ -437,7 +433,7 @@ ih264_intra_pred_luma_16x16_mode_plane_av8: ld1 {v2.2s}, [x1], x8 #ifdef __APPLE__ adrp x7, _ih264_gai1_intrapred_luma_plane_coeffs@GOTPAGE - ldr x7, [x7, _ih264_gai1_intrapred_luma_plane_coeffs@GOTPAGEOFF] + ldr x7, [x7, #_ih264_gai1_intrapred_luma_plane_coeffs@GOTPAGEOFF] #else adrp x7, :got:ih264_gai1_intrapred_luma_plane_coeffs ldr x7, [x7, #:got_lo12:ih264_gai1_intrapred_luma_plane_coeffs] diff --git a/dependencies/ih264d/common/armv8/ih264_intra_pred_luma_8x8_av8.s b/dependencies/ih264d/common/armv8/ih264_intra_pred_luma_8x8_av8.s index efc30c03..956ee0b1 100644 --- a/dependencies/ih264d/common/armv8/ih264_intra_pred_luma_8x8_av8.s +++ b/dependencies/ih264d/common/armv8/ih264_intra_pred_luma_8x8_av8.s @@ -56,11 +56,8 @@ .text .p2align 2 .include "ih264_neon_macros.s" -#ifdef __APPLE__ -.extern _ih264_gai1_intrapred_luma_8x8_horz_u -#else + .extern ih264_gai1_intrapred_luma_8x8_horz_u -#endif @@ -1032,6 +1029,7 @@ ih264_intra_pred_luma_8x8_mode_horz_u_av8: mov v3.d[0], v2.d[1] ext v4.16b, v2.16b , v2.16b , #1 mov v5.d[0], v4.d[1] + #ifdef __APPLE__ adrp x12, _ih264_gai1_intrapred_luma_8x8_horz_u@GOTPAGE ldr x12, [x12, _ih264_gai1_intrapred_luma_8x8_horz_u@GOTPAGEOFF] diff --git a/dependencies/ih264d/common/ih264_deblk_edge_filters.h b/dependencies/ih264d/common/ih264_deblk_edge_filters.h index 9b375207..1515b2bd 100644 --- a/dependencies/ih264d/common/ih264_deblk_edge_filters.h +++ b/dependencies/ih264d/common/ih264_deblk_edge_filters.h @@ -40,25 +40,24 @@ /*****************************************************************************/ /* Extern Function Declarations */ /*****************************************************************************/ -#ifdef __APPLE__ -#define av8(name) name __asm__(#name) -#else -#define av8(name) name -#endif -typedef void ih264_deblk_edge_bslt4_ft(UWORD8 *pu1_src, +typedef void _ih264_deblk_edge_bslt4_ft(UWORD8 *pu1_src, WORD32 src_strd, WORD32 alpha, WORD32 beta, UWORD32 u4_bs, const UWORD8 *pu1_cliptab ); -typedef void ih264_deblk_edge_bs4_ft(UWORD8 *pu1_src, +#define ih264_deblk_edge_bslt4_ft(arg) _ih264_deblk_edge_bslt4_ft arg __asm__(#arg); + +typedef void _ih264_deblk_edge_bs4_ft(UWORD8 *pu1_src, WORD32 src_strd, WORD32 alpha, WORD32 beta ); -typedef void ih264_deblk_chroma_edge_bslt4_ft(UWORD8 *pu1_src, +#define ih264_deblk_edge_bs4_ft(arg) _ih264_deblk_edge_bs4_ft arg __asm__(#arg); + +typedef void _ih264_deblk_chroma_edge_bslt4_ft(UWORD8 *pu1_src, WORD32 src_strd, WORD32 alpha_cb, WORD32 beta_cb, @@ -68,133 +67,137 @@ typedef void ih264_deblk_chroma_edge_bslt4_ft(UWORD8 *pu1_src, const UWORD8 *pu1_cliptab_cb, const UWORD8 *pu1_cliptab_cr); -typedef void ih264_deblk_chroma_edge_bs4_ft(UWORD8 *pu1_src, +#define ih264_deblk_chroma_edge_bslt4_ft(arg) _ih264_deblk_chroma_edge_bslt4_ft arg __asm__(#arg); + +typedef void _ih264_deblk_chroma_edge_bs4_ft(UWORD8 *pu1_src, WORD32 src_strd, WORD32 alpha_cb, WORD32 beta_cb, WORD32 alpha_cr, WORD32 beta_cr); +#define ih264_deblk_chroma_edge_bs4_ft(arg) _ih264_deblk_chroma_edge_bs4_ft arg __asm__(#arg); -ih264_deblk_edge_bs4_ft ih264_deblk_luma_horz_bs4; -ih264_deblk_edge_bs4_ft ih264_deblk_luma_vert_bs4; -ih264_deblk_edge_bs4_ft ih264_deblk_luma_vert_bs4_mbaff; + +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_horz_bs4); +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_vert_bs4); +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_vert_bs4_mbaff); -ih264_deblk_edge_bs4_ft ih264_deblk_chroma_horz_bs4_bp; -ih264_deblk_edge_bs4_ft ih264_deblk_chroma_vert_bs4_bp; -ih264_deblk_edge_bs4_ft ih264_deblk_chroma_vert_bs4_mbaff_bp; +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_bp); +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_bp); +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_mbaff_bp); -ih264_deblk_edge_bslt4_ft ih264_deblk_luma_horz_bslt4; -ih264_deblk_edge_bslt4_ft ih264_deblk_luma_vert_bslt4; -ih264_deblk_edge_bslt4_ft ih264_deblk_luma_vert_bslt4_mbaff; +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_horz_bslt4); +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_vert_bslt4); +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_vert_bslt4_mbaff); -ih264_deblk_edge_bslt4_ft ih264_deblk_chroma_horz_bslt4_bp; -ih264_deblk_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_bp; -ih264_deblk_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_mbaff_bp; +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_bp); +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_bp); +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_mbaff_bp); -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_vert_bs4; -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_horz_bs4; -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_vert_bs4_mbaff; -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_horz_bs4_mbaff; +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_vert_bs4); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_horz_bs4); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_mbaff); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_mbaff); -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4; -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_horz_bslt4; -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_mbaff; -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_horz_bslt4_mbaff; +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_mbaff); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_mbaff); /*A9*/ -ih264_deblk_edge_bs4_ft ih264_deblk_luma_horz_bs4_a9; -ih264_deblk_edge_bs4_ft ih264_deblk_luma_vert_bs4_a9; -ih264_deblk_edge_bs4_ft ih264_deblk_luma_vert_bs4_mbaff_a9; +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_horz_bs4_a9); +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_vert_bs4_a9); +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_vert_bs4_mbaff_a9); -ih264_deblk_edge_bs4_ft ih264_deblk_chroma_horz_bs4_bp_a9; -ih264_deblk_edge_bs4_ft ih264_deblk_chroma_vert_bs4_bp_a9; -ih264_deblk_edge_bs4_ft ih264_deblk_chroma_vert_bs4_mbaff_bp_a9; +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_bp_a9); +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_bp_a9); +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_mbaff_bp_a9); -ih264_deblk_edge_bslt4_ft ih264_deblk_luma_horz_bslt4_a9; -ih264_deblk_edge_bslt4_ft ih264_deblk_luma_vert_bslt4_a9; -ih264_deblk_edge_bslt4_ft ih264_deblk_luma_vert_bslt4_mbaff_a9; +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_horz_bslt4_a9); +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_vert_bslt4_a9); +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_vert_bslt4_mbaff_a9); -ih264_deblk_edge_bslt4_ft ih264_deblk_chroma_horz_bslt4_bp_a9; -ih264_deblk_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_bp_a9; -ih264_deblk_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_mbaff_bp_a9; +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_bp_a9); +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_bp_a9); +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_mbaff_bp_a9); -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_vert_bs4_a9; -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_horz_bs4_a9; -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_vert_bs4_mbaff_a9; -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_horz_bs4_mbaff_a9; +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_a9); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_a9); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_mbaff_a9); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_mbaff_a9); -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_a9; -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_horz_bslt4_a9; -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_mbaff_a9; -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_horz_bslt4_mbaff_a9; +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_a9); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_a9); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_mbaff_a9); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_mbaff_a9); /*AV8*/ -ih264_deblk_edge_bs4_ft av8(ih264_deblk_luma_horz_bs4_av8); -ih264_deblk_edge_bs4_ft av8(ih264_deblk_luma_vert_bs4_av8); -ih264_deblk_edge_bs4_ft av8(ih264_deblk_luma_vert_bs4_mbaff_av8); +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_horz_bs4_av8); +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_vert_bs4_av8); +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_vert_bs4_mbaff_av8); -ih264_deblk_edge_bs4_ft av8(ih264_deblk_chroma_horz_bs4_bp_av8); -ih264_deblk_edge_bs4_ft av8(ih264_deblk_chroma_vert_bs4_bp_av8); -ih264_deblk_edge_bs4_ft av8(ih264_deblk_chroma_vert_bs4_mbaff_bp_av8); +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_bp_av8); +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_bp_av8); +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_mbaff_bp_av8); -ih264_deblk_edge_bslt4_ft av8(ih264_deblk_luma_horz_bslt4_av8); -ih264_deblk_edge_bslt4_ft av8(ih264_deblk_luma_vert_bslt4_av8); -ih264_deblk_edge_bslt4_ft av8(ih264_deblk_luma_vert_bslt4_mbaff_av8); +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_horz_bslt4_av8); +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_vert_bslt4_av8); +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_vert_bslt4_mbaff_av8); -ih264_deblk_edge_bslt4_ft av8(ih264_deblk_chroma_horz_bslt4_bp_av8); -ih264_deblk_edge_bslt4_ft av8(ih264_deblk_chroma_vert_bslt4_bp_av8); -ih264_deblk_edge_bslt4_ft av8(ih264_deblk_chroma_vert_bslt4_mbaff_bp_av8); +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_bp_av8); +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_bp_av8); +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_mbaff_bp_av8); -ih264_deblk_chroma_edge_bs4_ft av8(ih264_deblk_chroma_vert_bs4_av8); -ih264_deblk_chroma_edge_bs4_ft av8(ih264_deblk_chroma_horz_bs4_av8); -ih264_deblk_chroma_edge_bs4_ft av8(ih264_deblk_chroma_vert_bs4_mbaff_av8); -ih264_deblk_chroma_edge_bs4_ft av8(ih264_deblk_chroma_horz_bs4_mbaff_av8); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_av8); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_av8); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_mbaff_av8); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_mbaff_av8); -ih264_deblk_chroma_edge_bslt4_ft av8(ih264_deblk_chroma_vert_bslt4_av8); -ih264_deblk_chroma_edge_bslt4_ft av8(ih264_deblk_chroma_horz_bslt4_av8); -ih264_deblk_chroma_edge_bslt4_ft av8(ih264_deblk_chroma_vert_bslt4_mbaff_av8); -ih264_deblk_chroma_edge_bslt4_ft av8(ih264_deblk_chroma_horz_bslt4_mbaff_av8); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_av8); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_av8); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_mbaff_av8); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_mbaff_av8); /*SSE3*/ -ih264_deblk_edge_bs4_ft ih264_deblk_luma_horz_bs4_ssse3; -ih264_deblk_edge_bs4_ft ih264_deblk_luma_vert_bs4_ssse3; -ih264_deblk_edge_bs4_ft ih264_deblk_luma_vert_bs4_mbaff_ssse3; +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_horz_bs4_ssse3); +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_vert_bs4_ssse3); +ih264_deblk_edge_bs4_ft(ih264_deblk_luma_vert_bs4_mbaff_ssse3); -ih264_deblk_edge_bs4_ft ih264_deblk_chroma_horz_bs4_bp_ssse3; -ih264_deblk_edge_bs4_ft ih264_deblk_chroma_vert_bs4_bp_ssse3; -ih264_deblk_edge_bs4_ft ih264_deblk_chroma_vert_bs4_mbaff_bp_ssse3; +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_bp_ssse3); +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_bp_ssse3); +ih264_deblk_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_mbaff_bp_ssse3); -ih264_deblk_edge_bslt4_ft ih264_deblk_luma_horz_bslt4_ssse3; -ih264_deblk_edge_bslt4_ft ih264_deblk_luma_vert_bslt4_ssse3; -ih264_deblk_edge_bslt4_ft ih264_deblk_luma_vert_bslt4_mbaff_ssse3; +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_horz_bslt4_ssse3); +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_vert_bslt4_ssse3); +ih264_deblk_edge_bslt4_ft(ih264_deblk_luma_vert_bslt4_mbaff_ssse3); -ih264_deblk_edge_bslt4_ft ih264_deblk_chroma_horz_bslt4_bp_ssse3; -ih264_deblk_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_bp_ssse3; -ih264_deblk_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_mbaff_bp_ssse3; +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_bp_ssse3); +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_bp_ssse3); +ih264_deblk_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_mbaff_bp_ssse3); -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_vert_bs4_ssse3; -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_horz_bs4_ssse3; -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_vert_bs4_mbaff_ssse3; -ih264_deblk_chroma_edge_bs4_ft ih264_deblk_chroma_horz_bs4_mbaff_ssse3; +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_ssse3); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_ssse3); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_vert_bs4_mbaff_ssse3); +ih264_deblk_chroma_edge_bs4_ft(ih264_deblk_chroma_horz_bs4_mbaff_ssse3); -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_ssse3; -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_horz_bslt4_ssse3; -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_vert_bslt4_mbaff_ssse3; -ih264_deblk_chroma_edge_bslt4_ft ih264_deblk_chroma_horz_bslt4_mbaff_ssse3; +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_ssse3); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_ssse3); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_vert_bslt4_mbaff_ssse3); +ih264_deblk_chroma_edge_bslt4_ft(ih264_deblk_chroma_horz_bslt4_mbaff_ssse3); #endif /* IH264_DEBLK_H_ */ diff --git a/dependencies/ih264d/common/ih264_inter_pred_filters.h b/dependencies/ih264d/common/ih264_inter_pred_filters.h index 3cc9b722..b4777445 100644 --- a/dependencies/ih264d/common/ih264_inter_pred_filters.h +++ b/dependencies/ih264d/common/ih264_inter_pred_filters.h @@ -100,13 +100,7 @@ extern const WORD32 ih264_g_six_tap[3];/* coefficients for 6 tap filtering*/ /* Extern Function Declarations */ /*****************************************************************************/ -#ifdef __APPLE__ -#define av8(name) name __asm__(#name) -#else -#define av8(name) name -#endif - -typedef void ih264_inter_pred_luma_ft(UWORD8 *pu1_src, +typedef void _ih264_inter_pred_luma_ft(UWORD8 *pu1_src, UWORD8 *pu1_dst, WORD32 src_strd, WORD32 dst_strd, @@ -115,14 +109,18 @@ typedef void ih264_inter_pred_luma_ft(UWORD8 *pu1_src, UWORD8* pu1_tmp, WORD32 dydx); -typedef void ih264_interleave_copy_ft(UWORD8 *pu1_src, +#define ih264_inter_pred_luma_ft(arg) _ih264_inter_pred_luma_ft arg __asm__(#arg); + +typedef void _ih264_interleave_copy_ft(UWORD8 *pu1_src, UWORD8 *pu1_dst, WORD32 src_strd, WORD32 dst_strd, WORD32 ht, WORD32 wd); -typedef void ih264_inter_pred_luma_bilinear_ft(UWORD8 *pu1_src1, +#define ih264_interleave_copy_ft(arg) _ih264_interleave_copy_ft arg __asm__(#arg); + +typedef void _ih264_inter_pred_luma_bilinear_ft(UWORD8 *pu1_src1, UWORD8 *pu1_src2, UWORD8 *pu1_dst, WORD32 src_strd1, @@ -131,7 +129,9 @@ typedef void ih264_inter_pred_luma_bilinear_ft(UWORD8 *pu1_src1, WORD32 height, WORD32 width); -typedef void ih264_inter_pred_chroma_ft(UWORD8 *pu1_src, +#define ih264_inter_pred_luma_bilinear_ft(arg) _ih264_inter_pred_luma_bilinear_ft arg __asm__(#arg); + +typedef void _ih264_inter_pred_chroma_ft(UWORD8 *pu1_src, UWORD8 *pu1_dst, WORD32 src_strd, WORD32 dst_strd, @@ -140,107 +140,109 @@ typedef void ih264_inter_pred_chroma_ft(UWORD8 *pu1_src, WORD32 ht, WORD32 wd); +#define ih264_inter_pred_chroma_ft(arg) _ih264_inter_pred_chroma_ft arg __asm__(#arg); + /* No NEON Declarations */ -ih264_inter_pred_luma_ft ih264_inter_pred_luma_copy; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_copy); -ih264_interleave_copy_ft ih264_interleave_copy; +ih264_interleave_copy_ft(ih264_interleave_copy); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_vert; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_vert); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_hpel_vert_hpel; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_hpel_vert_hpel); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_vert_qpel; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_vert_qpel); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_qpel; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_qpel_vert_qpel; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_vert_qpel); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_qpel_vert_hpel; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_vert_hpel); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_hpel_vert_qpel; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_hpel_vert_qpel); -ih264_inter_pred_luma_bilinear_ft ih264_inter_pred_luma_bilinear; +ih264_inter_pred_luma_bilinear_ft(ih264_inter_pred_luma_bilinear); -ih264_inter_pred_chroma_ft ih264_inter_pred_chroma; +ih264_inter_pred_chroma_ft(ih264_inter_pred_chroma); /* A9 NEON Declarations */ -ih264_inter_pred_luma_ft ih264_inter_pred_luma_copy_a9q; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_copy_a9q); -ih264_interleave_copy_ft ih264_interleave_copy_a9; +ih264_interleave_copy_ft(ih264_interleave_copy_a9); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_a9q; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_a9q); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_vert_a9q; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_vert_a9q); -ih264_inter_pred_luma_bilinear_ft ih264_inter_pred_luma_bilinear_a9q; +ih264_inter_pred_luma_bilinear_ft(ih264_inter_pred_luma_bilinear_a9q); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_hpel_vert_hpel_a9q; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_hpel_vert_hpel_a9q); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_qpel_a9q; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_a9q); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_vert_qpel_a9q; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_vert_qpel_a9q); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_qpel_vert_qpel_a9q; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_vert_qpel_a9q); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_qpel_vert_hpel_a9q; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_vert_hpel_a9q); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_hpel_vert_qpel_a9q; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_hpel_vert_qpel_a9q); -ih264_inter_pred_chroma_ft ih264_inter_pred_chroma_a9q; +ih264_inter_pred_chroma_ft(ih264_inter_pred_chroma_a9q); /* AV8 NEON Declarations */ -ih264_inter_pred_luma_ft av8(ih264_inter_pred_luma_copy_av8); +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_copy_av8); -ih264_interleave_copy_ft av8(ih264_interleave_copy_av8); +ih264_interleave_copy_ft(ih264_interleave_copy_av8); -ih264_inter_pred_luma_ft av8(ih264_inter_pred_luma_horz_av8); +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_av8); -ih264_inter_pred_luma_ft av8(ih264_inter_pred_luma_vert_av8); +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_vert_av8); -ih264_inter_pred_luma_ft av8(ih264_inter_pred_luma_horz_hpel_vert_hpel_av8); +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_hpel_vert_hpel_av8); -ih264_inter_pred_luma_ft av8(ih264_inter_pred_luma_horz_qpel_av8); +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_av8); -ih264_inter_pred_luma_ft av8(ih264_inter_pred_luma_vert_qpel_av8); +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_vert_qpel_av8); -ih264_inter_pred_luma_ft av8(ih264_inter_pred_luma_horz_qpel_vert_qpel_av8); +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_vert_qpel_av8); -ih264_inter_pred_luma_ft av8(ih264_inter_pred_luma_horz_qpel_vert_hpel_av8); +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_vert_hpel_av8); -ih264_inter_pred_luma_ft av8(ih264_inter_pred_luma_horz_hpel_vert_qpel_av8); +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_hpel_vert_qpel_av8); -ih264_inter_pred_chroma_ft av8(ih264_inter_pred_chroma_av8); +ih264_inter_pred_chroma_ft(ih264_inter_pred_chroma_av8); -ih264_inter_pred_chroma_ft av8(ih264_inter_pred_chroma_dx_zero_av8); +ih264_inter_pred_chroma_ft(ih264_inter_pred_chroma_dx_zero_av8); -ih264_inter_pred_chroma_ft av8(ih264_inter_pred_chroma_dy_zero_av8); +ih264_inter_pred_chroma_ft(ih264_inter_pred_chroma_dy_zero_av8); /* SSSE3 Intrinsic Declarations */ -ih264_inter_pred_luma_ft ih264_inter_pred_luma_copy_ssse3; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_copy_ssse3); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_ssse3; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_ssse3); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_vert_ssse3; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_vert_ssse3); -ih264_inter_pred_luma_bilinear_ft ih264_inter_pred_luma_bilinear_ssse3; +ih264_inter_pred_luma_bilinear_ft(ih264_inter_pred_luma_bilinear_ssse3); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_hpel_vert_hpel_ssse3; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_hpel_vert_hpel_ssse3); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_qpel_ssse3; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_ssse3); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_vert_qpel_ssse3; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_vert_qpel_ssse3); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_qpel_vert_qpel_ssse3; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_vert_qpel_ssse3); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_qpel_vert_hpel_ssse3; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_qpel_vert_hpel_ssse3); -ih264_inter_pred_luma_ft ih264_inter_pred_luma_horz_hpel_vert_qpel_ssse3; +ih264_inter_pred_luma_ft(ih264_inter_pred_luma_horz_hpel_vert_qpel_ssse3); -ih264_inter_pred_chroma_ft ih264_inter_pred_chroma_ssse3; +ih264_inter_pred_chroma_ft(ih264_inter_pred_chroma_ssse3); #endif diff --git a/dependencies/ih264d/common/ih264_intra_pred_filters.h b/dependencies/ih264d/common/ih264_intra_pred_filters.h index 99857201..33e68489 100644 --- a/dependencies/ih264d/common/ih264_intra_pred_filters.h +++ b/dependencies/ih264d/common/ih264_intra_pred_filters.h @@ -46,12 +46,6 @@ #define FILT121(a,b,c) ((a + (b<<1) + c + 2)>>2) /*! Filter (1,1) i.e (a + b) / 2 */ #define FILT11(a,b) ((a + b + 1)>>1) - -#ifdef __APPLE__ -#define av8(name) name __asm__(#name) -#else -#define av8(name) name -#endif /*****************************************************************************/ /* Global Variables */ /*****************************************************************************/ @@ -66,271 +60,277 @@ extern const WORD8 ih264_gai1_intrapred_luma_8x8_horz_u[]; /* Extern Function Declarations */ /*****************************************************************************/ -typedef void ih264_intra_pred_ref_filtering_ft(UWORD8 *pu1_left, + +typedef void _ih264_intra_pred_ref_filtering_ft(UWORD8 *pu1_left, UWORD8 *pu1_topleft, UWORD8 *pu1_top, UWORD8 *pu1_dst, WORD32 left_strd, WORD32 ngbr_avail); -typedef void ih264_intra_pred_luma_ft(UWORD8 *pu1_src, +#define ih264_intra_pred_ref_filtering_ft(arg) _ih264_intra_pred_ref_filtering_ft arg __asm__(#arg); + +typedef void _ih264_intra_pred_luma_ft(UWORD8 *pu1_src, UWORD8 *pu1_dst, WORD32 src_strd, WORD32 dst_strd, WORD32 ngbr_avail); +#define ih264_intra_pred_luma_ft(arg) _ih264_intra_pred_luma_ft arg __asm__(#arg); + /* No Neon Definitions */ /* Luma 4x4 Intra pred filters */ -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_vert; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_horz; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_dc; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_dc); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_diag_dl; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_diag_dl); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_diag_dr; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_diag_dr); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_vert_r; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_r); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_horz_d; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_d); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_vert_l; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_l); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_horz_u; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_u); /* Luma 8x8 Intra pred filters */ -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_vert; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_horz; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_dc; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_dc); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_diag_dl; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_diag_dl); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_diag_dr; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_diag_dr); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_vert_r; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_r); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_horz_d; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_d); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_vert_l; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_l); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_horz_u; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_u); /* Luma 16x16 Intra pred filters */ -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_vert; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_vert); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_horz; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_horz); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_dc; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_dc); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_plane; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_plane); /* Chroma 8x8 Intra pred filters */ -typedef ih264_intra_pred_luma_ft ih264_intra_pred_chroma_ft; +typedef _ih264_intra_pred_luma_ft _ih264_intra_pred_chroma_ft; +#define ih264_intra_pred_chroma_ft(arg) _ih264_intra_pred_chroma_ft arg __asm__(#arg); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_dc; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_dc); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_horz; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_horz); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_vert; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_vert); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_plane; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_plane); -ih264_intra_pred_ref_filtering_ft ih264_intra_pred_luma_8x8_mode_ref_filtering; +ih264_intra_pred_ref_filtering_ft(ih264_intra_pred_luma_8x8_mode_ref_filtering); /* A9 Definition */ /* Luma 4x4 Intra pred filters */ -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_vert_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_horz_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_dc_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_dc_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_diag_dl_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_diag_dl_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_diag_dr_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_diag_dr_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_vert_r_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_r_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_horz_d_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_d_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_vert_l_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_l_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_horz_u_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_u_a9q); /* Luma 8x8 Intra pred filters */ -ih264_intra_pred_ref_filtering_ft ih264_intra_pred_luma_8x8_mode_ref_filtering_a9q; +ih264_intra_pred_ref_filtering_ft(ih264_intra_pred_luma_8x8_mode_ref_filtering_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_vert_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_horz_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_dc_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_dc_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_diag_dl_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_diag_dl_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_diag_dr_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_diag_dr_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_vert_r_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_r_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_horz_d_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_d_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_vert_l_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_l_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_horz_u_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_u_a9q); /* Luma 16x16 Intra pred filters */ -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_vert_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_vert_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_horz_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_horz_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_dc_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_dc_a9q); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_plane_a9q; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_plane_a9q); /* Chroma 8x8 Intra pred filters */ -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_dc_a9q; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_dc_a9q); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_horz_a9q; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_horz_a9q); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_vert_a9q; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_vert_a9q); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_plane_a9q; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_plane_a9q); /* X86 Intrinsic Definitions */ /* Luma 4x4 Intra pred filters */ -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_vert_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_horz_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_dc_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_dc_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_diag_dl_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_diag_dl_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_diag_dr_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_diag_dr_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_vert_r_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_r_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_horz_d_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_d_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_vert_l_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_l_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_4x4_mode_horz_u_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_u_ssse3); /* Luma 8x8 Intra pred filters */ -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_vert_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_horz_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_dc_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_dc_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_diag_dl_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_diag_dl_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_diag_dr_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_diag_dr_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_vert_r_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_r_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_horz_d_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_d_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_vert_l_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_l_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_8x8_mode_horz_u_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_u_ssse3); /* Luma 16x16 Intra pred filters */ -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_vert_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_vert_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_horz_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_horz_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_dc_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_dc_ssse3); -ih264_intra_pred_luma_ft ih264_intra_pred_luma_16x16_mode_plane_ssse3; +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_plane_ssse3); /* Chroma 8x8 Intra pred filters */ -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_dc_ssse3; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_dc_ssse3); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_horz_ssse3; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_horz_ssse3); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_vert_ssse3; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_vert_ssse3); -ih264_intra_pred_chroma_ft ih264_intra_pred_chroma_8x8_mode_plane_ssse3; +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_plane_ssse3); /* AV8 Definition */ /* Luma 4x4 Intra pred filters */ -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_4x4_mode_vert_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_4x4_mode_horz_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_4x4_mode_dc_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_dc_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_4x4_mode_diag_dl_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_diag_dl_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_4x4_mode_diag_dr_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_diag_dr_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_4x4_mode_vert_r_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_r_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_4x4_mode_horz_d_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_d_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_4x4_mode_vert_l_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_vert_l_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_4x4_mode_horz_u_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_4x4_mode_horz_u_av8); /* Luma 8x8 Intra pred filters */ -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_8x8_mode_vert_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_8x8_mode_horz_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_8x8_mode_dc_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_dc_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_8x8_mode_diag_dl_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_diag_dl_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_8x8_mode_diag_dr_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_diag_dr_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_8x8_mode_vert_r_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_r_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_8x8_mode_horz_d_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_d_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_8x8_mode_vert_l_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_vert_l_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_8x8_mode_horz_u_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_8x8_mode_horz_u_av8); /* Luma 16x16 Intra pred filters */ -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_16x16_mode_vert_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_vert_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_16x16_mode_horz_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_horz_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_16x16_mode_dc_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_dc_av8); -ih264_intra_pred_luma_ft av8(ih264_intra_pred_luma_16x16_mode_plane_av8); +ih264_intra_pred_luma_ft(ih264_intra_pred_luma_16x16_mode_plane_av8); /* Chroma 8x8 Intra pred filters */ -ih264_intra_pred_chroma_ft av8(ih264_intra_pred_chroma_8x8_mode_dc_av8); +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_dc_av8); -ih264_intra_pred_chroma_ft av8(ih264_intra_pred_chroma_8x8_mode_horz_av8); +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_horz_av8); -ih264_intra_pred_chroma_ft av8(ih264_intra_pred_chroma_8x8_mode_vert_av8); +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_vert_av8); -ih264_intra_pred_chroma_ft av8(ih264_intra_pred_chroma_8x8_mode_plane_av8); +ih264_intra_pred_chroma_ft(ih264_intra_pred_chroma_8x8_mode_plane_av8); #endif /* IH264_INTRA_PRED_FILTERS_H_ */ diff --git a/dependencies/ih264d/common/ih264_padding.h b/dependencies/ih264d/common/ih264_padding.h index 82457548..320b3eaf 100644 --- a/dependencies/ih264d/common/ih264_padding.h +++ b/dependencies/ih264d/common/ih264_padding.h @@ -2,7 +2,7 @@ * * Copyright (C) 2015 The Android Open Source Project * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License")); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: * @@ -40,40 +40,36 @@ /*****************************************************************************/ /* Function Declarations */ /*****************************************************************************/ -#ifdef __APPLE__ -#define av8(name) name __asm__(#name) -#else -#define av8(name) name -#endif -typedef void ih264_pad(UWORD8 *, WORD32, WORD32, WORD32); +typedef void _ih264_pad(UWORD8 *, WORD32, WORD32, WORD32); +#define ih264_pad(arg) _ih264_pad arg __asm__(#arg); /* C function declarations */ -ih264_pad ih264_pad_top; -ih264_pad ih264_pad_bottom; -ih264_pad ih264_pad_left_luma; -ih264_pad ih264_pad_left_chroma; -ih264_pad ih264_pad_right_luma; -ih264_pad ih264_pad_right_chroma; +ih264_pad(ih264_pad_top); +ih264_pad(ih264_pad_bottom); +ih264_pad(ih264_pad_left_luma); +ih264_pad(ih264_pad_left_chroma); +ih264_pad(ih264_pad_right_luma); +ih264_pad(ih264_pad_right_chroma); /* A9 Q function declarations */ -ih264_pad ih264_pad_top_a9q; -ih264_pad ih264_pad_left_luma_a9q; -ih264_pad ih264_pad_left_chroma_a9q; -ih264_pad ih264_pad_right_luma_a9q; -ih264_pad ih264_pad_right_chroma_a9q; +ih264_pad(ih264_pad_top_a9q); +ih264_pad(ih264_pad_left_luma_a9q); +ih264_pad(ih264_pad_left_chroma_a9q); +ih264_pad(ih264_pad_right_luma_a9q); +ih264_pad(ih264_pad_right_chroma_a9q); /* AV8 function declarations */ -ih264_pad av8(ih264_pad_top_av8); -ih264_pad av8(ih264_pad_left_luma_av8); -ih264_pad av8(ih264_pad_left_chroma_av8); -ih264_pad av8(ih264_pad_right_luma_av8); -ih264_pad av8(ih264_pad_right_chroma_av8); +ih264_pad(ih264_pad_top_av8); +ih264_pad(ih264_pad_left_luma_av8); +ih264_pad(ih264_pad_left_chroma_av8); +ih264_pad(ih264_pad_right_luma_av8); +ih264_pad(ih264_pad_right_chroma_av8); -ih264_pad ih264_pad_left_luma_ssse3; -ih264_pad ih264_pad_left_chroma_ssse3; -ih264_pad ih264_pad_right_luma_ssse3; -ih264_pad ih264_pad_right_chroma_ssse3; +ih264_pad(ih264_pad_left_luma_ssse3); +ih264_pad(ih264_pad_left_chroma_ssse3); +ih264_pad(ih264_pad_right_luma_ssse3); +ih264_pad(ih264_pad_right_chroma_ssse3); #endif /*_IH264_PADDING_H_*/ diff --git a/dependencies/ih264d/common/ih264_trans_quant_itrans_iquant.h b/dependencies/ih264d/common/ih264_trans_quant_itrans_iquant.h index 8e87cc5a..fad92eca 100644 --- a/dependencies/ih264d/common/ih264_trans_quant_itrans_iquant.h +++ b/dependencies/ih264d/common/ih264_trans_quant_itrans_iquant.h @@ -39,13 +39,9 @@ /*****************************************************************************/ /* Extern Function Declarations */ /*****************************************************************************/ -#ifdef __APPLE__ -#define av8(name) name __asm__(#name) -#else -#define av8(name) name -#endif -typedef void ih264_resi_trans_dctrans_quant_ft(UWORD8*pu1_src, + +typedef void _ih264_resi_trans_dctrans_quant_ft(UWORD8*pu1_src, UWORD8 *pu1_pred, WORD16 *pi2_out, WORD32 src_strd, @@ -57,7 +53,9 @@ typedef void ih264_resi_trans_dctrans_quant_ft(UWORD8*pu1_src, UWORD32 u4_round_fact, UWORD8 *pu1_nnz); -typedef void ih264_idctrans_iquant_itrans_recon_ft(WORD16 *pi2_src, +#define ih264_resi_trans_dctrans_quant_ft(arg) _ih264_resi_trans_dctrans_quant_ft arg __asm__(#arg); + +typedef void _ih264_idctrans_iquant_itrans_recon_ft(WORD16 *pi2_src, UWORD8 *pu1_pred, UWORD8 *pu1_out, WORD32 src_strd, @@ -69,6 +67,8 @@ typedef void ih264_idctrans_iquant_itrans_recon_ft(WORD16 *pi2_src, UWORD32 pi4_cntrl, WORD32 *pi4_tmp); +#define ih264_idctrans_iquant_itrans_recon_ft(arg) _ih264_pad arg __asm__(#arg); + /*Function prototype declarations*/ typedef void ih264_resi_trans_quant_ft(UWORD8*pu1_src, @@ -83,7 +83,9 @@ typedef void ih264_resi_trans_quant_ft(UWORD8*pu1_src, UWORD8 *pu1_nnz, WORD16 *pi2_alt_dc_addr); -typedef void ih264_luma_16x16_resi_trans_dctrans_quant_ft(UWORD8 *pu1_src, +#define ih264_pad(arg) _ih264_pad arg __asm__(#arg); + +typedef void _ih264_luma_16x16_resi_trans_dctrans_quant_ft(UWORD8 *pu1_src, UWORD8 *pu1_pred, WORD16 *pi2_out, WORD32 src_strd, @@ -96,7 +98,9 @@ typedef void ih264_luma_16x16_resi_trans_dctrans_quant_ft(UWORD8 *pu1_src, UWORD8 *pu1_nnz, UWORD32 u4_dc_flag); -typedef void ih264_chroma_8x8_resi_trans_dctrans_quant_ft(UWORD8 *pu1_src, +#define ih264_luma_16x16_resi_trans_dctrans_quant_ft(arg) _ih264_luma_16x16_resi_trans_dctrans_quant_ft arg __asm__(#arg); + +typedef void _ih264_chroma_8x8_resi_trans_dctrans_quant_ft(UWORD8 *pu1_src, UWORD8 *pu1_pred, WORD16 *pi2_out, WORD32 src_strd, @@ -108,7 +112,9 @@ typedef void ih264_chroma_8x8_resi_trans_dctrans_quant_ft(UWORD8 *pu1_src, UWORD32 u4_round_factor, UWORD8 *pu1_nnz); -typedef void ih264_iquant_itrans_recon_ft(WORD16 *pi2_src, +#define ih264_chroma_8x8_resi_trans_dctrans_quant_ft(arg) _ih264_chroma_8x8_resi_trans_dctrans_quant_ft arg __asm__(#arg); + +typedef void _ih264_iquant_itrans_recon_ft(WORD16 *pi2_src, UWORD8 *pu1_pred, UWORD8 *pu1_out, WORD32 pred_strd, @@ -120,8 +126,10 @@ typedef void ih264_iquant_itrans_recon_ft(WORD16 *pi2_src, WORD32 iq_start_idx, WORD16 *pi2_dc_ld_addr); +#define ih264_iquant_itrans_recon_ft(arg) _ih264_iquant_itrans_recon_ft arg __asm__(#arg); -typedef void ih264_iquant_itrans_recon_chroma_ft(WORD16 *pi2_src, + +typedef void _ih264_iquant_itrans_recon_chroma_ft(WORD16 *pi2_src, UWORD8 *pu1_pred, UWORD8 *pu1_out, WORD32 pred_strd, @@ -132,8 +140,10 @@ typedef void ih264_iquant_itrans_recon_chroma_ft(WORD16 *pi2_src, WORD16 *pi2_tmp, WORD16 *pi2_dc_src); +#define ih264_iquant_itrans_recon_chroma_ft(arg) _ih264_iquant_itrans_recon_chroma_ft arg __asm__(#arg); -typedef void ih264_luma_16x16_idctrans_iquant_itrans_recon_ft(WORD16 *pi2_src, + +typedef void _ih264_luma_16x16_idctrans_iquant_itrans_recon_ft(WORD16 *pi2_src, UWORD8 *pu1_pred, UWORD8 *pu1_out, WORD32 src_strd, @@ -146,7 +156,9 @@ typedef void ih264_luma_16x16_idctrans_iquant_itrans_recon_ft(WORD16 *pi2_src, UWORD32 u4_dc_trans_flag, WORD32 *pi4_tmp); -typedef void ih264_chroma_8x8_idctrans_iquant_itrans_recon_ft(WORD16 *pi2_src, +#define ih264_luma_16x16_idctrans_iquant_itrans_recon_ft(arg) _ih264_luma_16x16_idctrans_iquant_itrans_recon_ft arg __asm__(#arg); + +typedef void _ih264_chroma_8x8_idctrans_iquant_itrans_recon_ft(WORD16 *pi2_src, UWORD8 *pu1_pred, UWORD8 *pu1_out, WORD32 src_strd, @@ -158,79 +170,85 @@ typedef void ih264_chroma_8x8_idctrans_iquant_itrans_recon_ft(WORD16 *pi2_src, UWORD32 pi4_cntrl, WORD32 *pi4_tmp); -typedef void ih264_ihadamard_scaling_ft(WORD16* pi2_src, +#define ih264_chroma_8x8_idctrans_iquant_itrans_recon_ft(arg) _ih264_chroma_8x8_idctrans_iquant_itrans_recon_ft arg __asm__(#arg); + +typedef void _ih264_ihadamard_scaling_ft(WORD16* pi2_src, WORD16* pi2_out, const UWORD16 *pu2_iscal_mat, const UWORD16 *pu2_weigh_mat, UWORD32 u4_qp_div_6, WORD32* pi4_tmp); -typedef void ih264_hadamard_quant_ft(WORD16 *pi2_src, WORD16 *pi2_dst, +#define ih264_ihadamard_scaling_ft(arg) _ih264_ihadamard_scaling_ft arg __asm__(#arg); + +typedef void _ih264_hadamard_quant_ft(WORD16 *pi2_src, WORD16 *pi2_dst, const UWORD16 *pu2_scale_matrix, const UWORD16 *pu2_threshold_matrix, UWORD32 u4_qbits, UWORD32 u4_round_factor,UWORD8 *pu1_nnz); -ih264_resi_trans_quant_ft ih264_resi_trans_quant_4x4; -ih264_resi_trans_quant_ft ih264_resi_trans_quant_chroma_4x4; -ih264_resi_trans_quant_ft ih264_resi_trans_quant_8x8; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_4x4; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_8x8; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_4x4_dc; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_8x8_dc; -ih264_iquant_itrans_recon_chroma_ft ih264_iquant_itrans_recon_chroma_4x4; -ih264_iquant_itrans_recon_chroma_ft ih264_iquant_itrans_recon_chroma_4x4_dc; -ih264_ihadamard_scaling_ft ih264_ihadamard_scaling_4x4; -ih264_ihadamard_scaling_ft ih264_ihadamard_scaling_2x2_uv; -ih264_hadamard_quant_ft ih264_hadamard_quant_4x4; -ih264_hadamard_quant_ft ih264_hadamard_quant_2x2_uv; +#define ih264_hadamard_quant_ft(arg) _ih264_hadamard_quant_ft arg __asm__(#arg); + +ih264_resi_trans_quant_ft(ih264_resi_trans_quant_4x4); +ih264_resi_trans_quant_ft(ih264_resi_trans_quant_chroma_4x4); +ih264_resi_trans_quant_ft(ih264_resi_trans_quant_8x8); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_4x4); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_8x8); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_4x4_dc); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_8x8_dc); +ih264_iquant_itrans_recon_chroma_ft(ih264_iquant_itrans_recon_chroma_4x4); +ih264_iquant_itrans_recon_chroma_ft(ih264_iquant_itrans_recon_chroma_4x4_dc); +ih264_ihadamard_scaling_ft(ih264_ihadamard_scaling_4x4); +ih264_ihadamard_scaling_ft(ih264_ihadamard_scaling_2x2_uv); +ih264_hadamard_quant_ft(ih264_hadamard_quant_4x4); +ih264_hadamard_quant_ft(ih264_hadamard_quant_2x2_uv); /*A9 Declarations*/ -ih264_resi_trans_quant_ft ih264_resi_trans_quant_4x4_a9; -ih264_resi_trans_quant_ft ih264_resi_trans_quant_chroma_4x4_a9; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_4x4_a9; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_8x8_a9; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_4x4_dc_a9; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_8x8_dc_a9; -ih264_iquant_itrans_recon_chroma_ft ih264_iquant_itrans_recon_chroma_4x4_a9; -ih264_iquant_itrans_recon_chroma_ft ih264_iquant_itrans_recon_chroma_4x4_dc_a9; -ih264_luma_16x16_resi_trans_dctrans_quant_ft ih264_luma_16x16_resi_trans_dctrans_quant_a9; -ih264_chroma_8x8_resi_trans_dctrans_quant_ft ih264_chroma_8x8_resi_trans_dctrans_quant_a9; -ih264_luma_16x16_idctrans_iquant_itrans_recon_ft ih264_luma_16x16_idctrans_iquant_itrans_recon_a9; -ih264_chroma_8x8_idctrans_iquant_itrans_recon_ft ih264_chroma_8x8_idctrans_iquant_itrans_recon_a9; -ih264_ihadamard_scaling_ft ih264_ihadamard_scaling_4x4_a9; -ih264_ihadamard_scaling_ft ih264_ihadamard_scaling_2x2_uv_a9; -ih264_hadamard_quant_ft ih264_hadamard_quant_4x4_a9; -ih264_hadamard_quant_ft ih264_hadamard_quant_2x2_uv_a9; +ih264_resi_trans_quant_ft(ih264_resi_trans_quant_4x4_a9); +ih264_resi_trans_quant_ft(ih264_resi_trans_quant_chroma_4x4_a9); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_4x4_a9); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_8x8_a9); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_4x4_dc_a9); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_8x8_dc_a9); +ih264_iquant_itrans_recon_chroma_ft(ih264_iquant_itrans_recon_chroma_4x4_a9); +ih264_iquant_itrans_recon_chroma_ft(ih264_iquant_itrans_recon_chroma_4x4_dc_a9); +ih264_luma_16x16_resi_trans_dctrans_quant_ft(ih264_luma_16x16_resi_trans_dctrans_quant_a9); +ih264_chroma_8x8_resi_trans_dctrans_quant_ft(ih264_chroma_8x8_resi_trans_dctrans_quant_a9); +ih264_luma_16x16_idctrans_iquant_itrans_recon_ft(ih264_luma_16x16_idctrans_iquant_itrans_recon_a9); +ih264_chroma_8x8_idctrans_iquant_itrans_recon_ft(ih264_chroma_8x8_idctrans_iquant_itrans_recon_a9); +ih264_ihadamard_scaling_ft(ih264_ihadamard_scaling_4x4_a9); +ih264_ihadamard_scaling_ft(ih264_ihadamard_scaling_2x2_uv_a9); +ih264_hadamard_quant_ft(ih264_hadamard_quant_4x4_a9); +ih264_hadamard_quant_ft(ih264_hadamard_quant_2x2_uv_a9); /*Av8 Declarations*/ -ih264_resi_trans_quant_ft av8(ih264_resi_trans_quant_4x4_av8); -ih264_resi_trans_quant_ft av8(ih264_resi_trans_quant_chroma_4x4_av8); -ih264_iquant_itrans_recon_ft av8(ih264_iquant_itrans_recon_4x4_av8); -ih264_iquant_itrans_recon_ft av8(ih264_iquant_itrans_recon_8x8_av8); -ih264_iquant_itrans_recon_ft av8(ih264_iquant_itrans_recon_4x4_dc_av8); -ih264_iquant_itrans_recon_ft av8(ih264_iquant_itrans_recon_8x8_dc_av8); -ih264_iquant_itrans_recon_chroma_ft av8(ih264_iquant_itrans_recon_chroma_4x4_av8); -ih264_iquant_itrans_recon_chroma_ft av8(ih264_iquant_itrans_recon_chroma_4x4_dc_av8); -ih264_ihadamard_scaling_ft av8(ih264_ihadamard_scaling_4x4_av8); -ih264_ihadamard_scaling_ft av8(ih264_ihadamard_scaling_2x2_uv_av8); -ih264_hadamard_quant_ft av8(ih264_hadamard_quant_4x4_av8); -ih264_hadamard_quant_ft av8(ih264_hadamard_quant_2x2_uv_av8); +ih264_resi_trans_quant_ft(ih264_resi_trans_quant_4x4_av8); +ih264_resi_trans_quant_ft(ih264_resi_trans_quant_chroma_4x4_av8); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_4x4_av8); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_8x8_av8); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_4x4_dc_av8); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_8x8_dc_av8); +ih264_iquant_itrans_recon_chroma_ft(ih264_iquant_itrans_recon_chroma_4x4_av8); +ih264_iquant_itrans_recon_chroma_ft(ih264_iquant_itrans_recon_chroma_4x4_dc_av8); +ih264_ihadamard_scaling_ft(ih264_ihadamard_scaling_4x4_av8); +ih264_ihadamard_scaling_ft(ih264_ihadamard_scaling_2x2_uv_av8); +ih264_hadamard_quant_ft(ih264_hadamard_quant_4x4_av8); +ih264_hadamard_quant_ft(ih264_hadamard_quant_2x2_uv_av8); /*SSSE3 Declarations*/ -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_4x4_ssse3; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_8x8_ssse3; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_4x4_dc_ssse3; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_8x8_dc_ssse3; -ih264_iquant_itrans_recon_chroma_ft ih264_iquant_itrans_recon_chroma_4x4_dc_ssse3; -ih264_ihadamard_scaling_ft ih264_ihadamard_scaling_4x4_ssse3; -ih264_ihadamard_scaling_ft ih264_ihadamard_scaling_2x2_uv_ssse3; +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_4x4_ssse3); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_8x8_ssse3); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_4x4_dc_ssse3); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_8x8_dc_ssse3); +ih264_iquant_itrans_recon_chroma_ft(ih264_iquant_itrans_recon_chroma_4x4_dc_ssse3); +ih264_ihadamard_scaling_ft(ih264_ihadamard_scaling_4x4_ssse3); +ih264_ihadamard_scaling_ft(ih264_ihadamard_scaling_2x2_uv_ssse3); /*SSSE42 Declarations*/ -ih264_resi_trans_quant_ft ih264_resi_trans_quant_4x4_sse42; -ih264_resi_trans_quant_ft ih264_resi_trans_quant_chroma_4x4_sse42; -ih264_iquant_itrans_recon_ft ih264_iquant_itrans_recon_4x4_sse42; -ih264_iquant_itrans_recon_chroma_ft ih264_iquant_itrans_recon_chroma_4x4_sse42; -ih264_ihadamard_scaling_ft ih264_ihadamard_scaling_4x4_sse42; -ih264_hadamard_quant_ft ih264_hadamard_quant_4x4_sse42; -ih264_hadamard_quant_ft ih264_hadamard_quant_2x2_uv_sse42; +ih264_resi_trans_quant_ft(ih264_resi_trans_quant_4x4_sse42); +ih264_resi_trans_quant_ft(ih264_resi_trans_quant_chroma_4x4_sse42); +ih264_iquant_itrans_recon_ft(ih264_iquant_itrans_recon_4x4_sse42); +ih264_iquant_itrans_recon_chroma_ft(ih264_iquant_itrans_recon_chroma_4x4_sse42); +ih264_ihadamard_scaling_ft(ih264_ihadamard_scaling_4x4_sse42); +ih264_hadamard_quant_ft(ih264_hadamard_quant_4x4_sse42); +ih264_hadamard_quant_ft(ih264_hadamard_quant_2x2_uv_sse42); #endif /* IH264_TRANS_QUANT_H_ */ diff --git a/dependencies/ih264d/common/ih264_weighted_pred.h b/dependencies/ih264d/common/ih264_weighted_pred.h index 6696e02a..990b60b8 100644 --- a/dependencies/ih264d/common/ih264_weighted_pred.h +++ b/dependencies/ih264d/common/ih264_weighted_pred.h @@ -68,13 +68,7 @@ /*****************************************************************************/ /* Extern Function Declarations */ /*****************************************************************************/ -#ifdef __APPLE__ -#define av8(name) name __asm__(#name) -#else -#define av8(name) name -#endif - -typedef void ih264_default_weighted_pred_ft(UWORD8 *puc_src1, +typedef void _ih264_default_weighted_pred_ft(UWORD8 *puc_src1, UWORD8 *puc_src2, UWORD8 *puc_dst, WORD32 src_strd1, @@ -83,7 +77,9 @@ typedef void ih264_default_weighted_pred_ft(UWORD8 *puc_src1, WORD32 ht, WORD32 wd); -typedef void ih264_weighted_pred_ft(UWORD8 *puc_src, +#define ih264_default_weighted_pred_ft(arg) _ih264_default_weighted_pred_ft arg __asm__(#arg); + +typedef void _ih264_weighted_pred_ft(UWORD8 *puc_src, UWORD8 *puc_dst, WORD32 src_strd, WORD32 dst_strd, @@ -93,7 +89,9 @@ typedef void ih264_weighted_pred_ft(UWORD8 *puc_src, WORD32 ht, WORD32 wd); -typedef void ih264_weighted_bi_pred_ft(UWORD8 *puc_src1, +#define ih264_weighted_pred_ft(arg) _ih264_weighted_pred_ft arg __asm__(#arg); + +typedef void _ih264_weighted_bi_pred_ft(UWORD8 *puc_src1, UWORD8 *puc_src2, UWORD8 *puc_dst, WORD32 src_strd1, @@ -107,63 +105,65 @@ typedef void ih264_weighted_bi_pred_ft(UWORD8 *puc_src1, WORD32 ht, WORD32 wd); +#define ih264_weighted_bi_pred_ft(arg) _ih264_weighted_bi_pred_ft arg __asm__(#arg); + /* No NEON Declarations */ -ih264_default_weighted_pred_ft ih264_default_weighted_pred_luma; +ih264_default_weighted_pred_ft(ih264_default_weighted_pred_luma); -ih264_default_weighted_pred_ft ih264_default_weighted_pred_chroma; +ih264_default_weighted_pred_ft(ih264_default_weighted_pred_chroma); -ih264_weighted_pred_ft ih264_weighted_pred_luma; +ih264_weighted_pred_ft(ih264_weighted_pred_luma); -ih264_weighted_pred_ft ih264_weighted_pred_chroma; +ih264_weighted_pred_ft(ih264_weighted_pred_chroma); -ih264_weighted_bi_pred_ft ih264_weighted_bi_pred_luma; +ih264_weighted_bi_pred_ft(ih264_weighted_bi_pred_luma); -ih264_weighted_bi_pred_ft ih264_weighted_bi_pred_chroma; +ih264_weighted_bi_pred_ft(ih264_weighted_bi_pred_chroma); /* A9 NEON Declarations */ -ih264_default_weighted_pred_ft ih264_default_weighted_pred_luma_a9q; +ih264_default_weighted_pred_ft(ih264_default_weighted_pred_luma_a9q); -ih264_default_weighted_pred_ft ih264_default_weighted_pred_chroma_a9q; +ih264_default_weighted_pred_ft(ih264_default_weighted_pred_chroma_a9q); -ih264_weighted_pred_ft ih264_weighted_pred_luma_a9q; +ih264_weighted_pred_ft(ih264_weighted_pred_luma_a9q); -ih264_weighted_pred_ft ih264_weighted_pred_chroma_a9q; +ih264_weighted_pred_ft(ih264_weighted_pred_chroma_a9q); -ih264_weighted_bi_pred_ft ih264_weighted_bi_pred_luma_a9q; +ih264_weighted_bi_pred_ft(ih264_weighted_bi_pred_luma_a9q); -ih264_weighted_bi_pred_ft ih264_weighted_bi_pred_chroma_a9q; +ih264_weighted_bi_pred_ft(ih264_weighted_bi_pred_chroma_a9q); /* AV8 NEON Declarations */ -ih264_default_weighted_pred_ft av8(ih264_default_weighted_pred_luma_av8); +ih264_default_weighted_pred_ft(ih264_default_weighted_pred_luma_av8); -ih264_default_weighted_pred_ft av8(ih264_default_weighted_pred_chroma_av8); +ih264_default_weighted_pred_ft(ih264_default_weighted_pred_chroma_av8); -ih264_weighted_pred_ft av8(ih264_weighted_pred_luma_av8); +ih264_weighted_pred_ft(ih264_weighted_pred_luma_av8); -ih264_weighted_pred_ft av8(ih264_weighted_pred_chroma_av8); +ih264_weighted_pred_ft(ih264_weighted_pred_chroma_av8); -ih264_weighted_bi_pred_ft av8(ih264_weighted_bi_pred_luma_av8); +ih264_weighted_bi_pred_ft(ih264_weighted_bi_pred_luma_av8); -ih264_weighted_bi_pred_ft av8(ih264_weighted_bi_pred_chroma_av8); +ih264_weighted_bi_pred_ft(ih264_weighted_bi_pred_chroma_av8); /* SSE42 Intrinsic Declarations */ -ih264_default_weighted_pred_ft ih264_default_weighted_pred_luma_sse42; +ih264_default_weighted_pred_ft(ih264_default_weighted_pred_luma_sse42); -ih264_default_weighted_pred_ft ih264_default_weighted_pred_chroma_sse42; +ih264_default_weighted_pred_ft(ih264_default_weighted_pred_chroma_sse42); -ih264_weighted_pred_ft ih264_weighted_pred_luma_sse42; +ih264_weighted_pred_ft(ih264_weighted_pred_luma_sse42); -ih264_weighted_pred_ft ih264_weighted_pred_chroma_sse42; +ih264_weighted_pred_ft(ih264_weighted_pred_chroma_sse42); -ih264_weighted_bi_pred_ft ih264_weighted_bi_pred_luma_sse42; +ih264_weighted_bi_pred_ft(ih264_weighted_bi_pred_luma_sse42); -ih264_weighted_bi_pred_ft ih264_weighted_bi_pred_chroma_sse42; +ih264_weighted_bi_pred_ft(ih264_weighted_bi_pred_chroma_sse42); #endif /* IH264_WEIGHTED_PRED_H_ */ diff --git a/dependencies/ih264d/decoder/ih264d_structs.h b/dependencies/ih264d/decoder/ih264d_structs.h index 989bd33c..e5309602 100644 --- a/dependencies/ih264d/decoder/ih264d_structs.h +++ b/dependencies/ih264d/decoder/ih264d_structs.h @@ -1365,112 +1365,112 @@ typedef struct _DecStruct UWORD8 *pu1_mv_bank_buf_base; UWORD8 *pu1_init_dpb_base; - ih264_default_weighted_pred_ft *pf_default_weighted_pred_luma; + _ih264_default_weighted_pred_ft *pf_default_weighted_pred_luma; - ih264_default_weighted_pred_ft *pf_default_weighted_pred_chroma; + _ih264_default_weighted_pred_ft *pf_default_weighted_pred_chroma; - ih264_weighted_pred_ft *pf_weighted_pred_luma; + _ih264_weighted_pred_ft *pf_weighted_pred_luma; - ih264_weighted_pred_ft *pf_weighted_pred_chroma; + _ih264_weighted_pred_ft *pf_weighted_pred_chroma; - ih264_weighted_bi_pred_ft *pf_weighted_bi_pred_luma; + _ih264_weighted_bi_pred_ft *pf_weighted_bi_pred_luma; - ih264_weighted_bi_pred_ft *pf_weighted_bi_pred_chroma; + _ih264_weighted_bi_pred_ft *pf_weighted_bi_pred_chroma; - ih264_pad *pf_pad_top; - ih264_pad *pf_pad_bottom; - ih264_pad *pf_pad_left_luma; - ih264_pad *pf_pad_left_chroma; - ih264_pad *pf_pad_right_luma; - ih264_pad *pf_pad_right_chroma; + _ih264_pad *pf_pad_top; + _ih264_pad *pf_pad_bottom; + _ih264_pad *pf_pad_left_luma; + _ih264_pad *pf_pad_left_chroma; + _ih264_pad *pf_pad_right_luma; + _ih264_pad *pf_pad_right_chroma; - ih264_inter_pred_chroma_ft *pf_inter_pred_chroma; + _ih264_inter_pred_chroma_ft *pf_inter_pred_chroma; - ih264_inter_pred_luma_ft *apf_inter_pred_luma[16]; + _ih264_inter_pred_luma_ft *apf_inter_pred_luma[16]; - ih264_intra_pred_luma_ft *apf_intra_pred_luma_16x16[4]; + _ih264_intra_pred_luma_ft *apf_intra_pred_luma_16x16[4]; - ih264_intra_pred_luma_ft *apf_intra_pred_luma_8x8[9]; + _ih264_intra_pred_luma_ft *apf_intra_pred_luma_8x8[9]; - ih264_intra_pred_luma_ft *apf_intra_pred_luma_4x4[9]; + _ih264_intra_pred_luma_ft *apf_intra_pred_luma_4x4[9]; - ih264_intra_pred_ref_filtering_ft *pf_intra_pred_ref_filtering; + _ih264_intra_pred_ref_filtering_ft *pf_intra_pred_ref_filtering; - ih264_intra_pred_chroma_ft *apf_intra_pred_chroma[4]; + _ih264_intra_pred_chroma_ft *apf_intra_pred_chroma[4]; - ih264_iquant_itrans_recon_ft *pf_iquant_itrans_recon_luma_4x4; + _ih264_iquant_itrans_recon_ft *pf_iquant_itrans_recon_luma_4x4; - ih264_iquant_itrans_recon_ft *pf_iquant_itrans_recon_luma_4x4_dc; + _ih264_iquant_itrans_recon_ft *pf_iquant_itrans_recon_luma_4x4_dc; - ih264_iquant_itrans_recon_ft *pf_iquant_itrans_recon_luma_8x8; + _ih264_iquant_itrans_recon_ft *pf_iquant_itrans_recon_luma_8x8; - ih264_iquant_itrans_recon_ft *pf_iquant_itrans_recon_luma_8x8_dc; + _ih264_iquant_itrans_recon_ft *pf_iquant_itrans_recon_luma_8x8_dc; - ih264_iquant_itrans_recon_chroma_ft *pf_iquant_itrans_recon_chroma_4x4; + _ih264_iquant_itrans_recon_chroma_ft *pf_iquant_itrans_recon_chroma_4x4; - ih264_iquant_itrans_recon_chroma_ft *pf_iquant_itrans_recon_chroma_4x4_dc; + _ih264_iquant_itrans_recon_chroma_ft *pf_iquant_itrans_recon_chroma_4x4_dc; - ih264_ihadamard_scaling_ft *pf_ihadamard_scaling_4x4; + _ih264_ihadamard_scaling_ft *pf_ihadamard_scaling_4x4; /** * deblock vertical luma edge with blocking strength 4 */ - ih264_deblk_edge_bs4_ft *pf_deblk_luma_vert_bs4; + _ih264_deblk_edge_bs4_ft *pf_deblk_luma_vert_bs4; /** * deblock vertical luma edge with blocking strength less than 4 */ - ih264_deblk_edge_bslt4_ft *pf_deblk_luma_vert_bslt4; + _ih264_deblk_edge_bslt4_ft *pf_deblk_luma_vert_bslt4; /** * deblock vertical luma edge with blocking strength 4 for mbaff */ - ih264_deblk_edge_bs4_ft *pf_deblk_luma_vert_bs4_mbaff; + _ih264_deblk_edge_bs4_ft *pf_deblk_luma_vert_bs4_mbaff; /** * deblock vertical luma edge with blocking strength less than 4 for mbaff */ - ih264_deblk_edge_bslt4_ft *pf_deblk_luma_vert_bslt4_mbaff; + _ih264_deblk_edge_bslt4_ft *pf_deblk_luma_vert_bslt4_mbaff; /** * deblock vertical chroma edge with blocking strength 4 */ - ih264_deblk_chroma_edge_bs4_ft *pf_deblk_chroma_vert_bs4; + _ih264_deblk_chroma_edge_bs4_ft *pf_deblk_chroma_vert_bs4; /** * deblock vertical chroma edge with blocking strength less than 4 */ - ih264_deblk_chroma_edge_bslt4_ft *pf_deblk_chroma_vert_bslt4; + _ih264_deblk_chroma_edge_bslt4_ft *pf_deblk_chroma_vert_bslt4; /** * deblock vertical chroma edge with blocking strength 4 for mbaff */ - ih264_deblk_chroma_edge_bs4_ft *pf_deblk_chroma_vert_bs4_mbaff; + _ih264_deblk_chroma_edge_bs4_ft *pf_deblk_chroma_vert_bs4_mbaff; /** * deblock vertical chroma edge with blocking strength less than 4 for mbaff */ - ih264_deblk_chroma_edge_bslt4_ft *pf_deblk_chroma_vert_bslt4_mbaff; + _ih264_deblk_chroma_edge_bslt4_ft *pf_deblk_chroma_vert_bslt4_mbaff; /** * deblock horizontal luma edge with blocking strength 4 */ - ih264_deblk_edge_bs4_ft *pf_deblk_luma_horz_bs4; + _ih264_deblk_edge_bs4_ft *pf_deblk_luma_horz_bs4; /** * deblock horizontal luma edge with blocking strength less than 4 */ - ih264_deblk_edge_bslt4_ft *pf_deblk_luma_horz_bslt4; + _ih264_deblk_edge_bslt4_ft *pf_deblk_luma_horz_bslt4; /** * deblock horizontal chroma edge with blocking strength 4 */ - ih264_deblk_chroma_edge_bs4_ft *pf_deblk_chroma_horz_bs4; + _ih264_deblk_chroma_edge_bs4_ft *pf_deblk_chroma_horz_bs4; /** * deblock horizontal chroma edge with blocking strength less than 4 */ - ih264_deblk_chroma_edge_bslt4_ft *pf_deblk_chroma_horz_bslt4; + _ih264_deblk_chroma_edge_bslt4_ft *pf_deblk_chroma_horz_bslt4; } dec_struct_t;