diff options
author | Harish Mahendrakar <hmahendrakar@google.com> | 2024-03-22 23:46:18 +0000 |
---|---|---|
committer | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2024-03-24 16:18:10 -0700 |
commit | bf58c9a88529b4d10985d95d83c9bbdc2bab789a (patch) | |
tree | 63a637b2430813ab2dd779326cca9dd382619622 | |
parent | a7874ebcf88499106deec0f87ebc18672fd55ea8 (diff) | |
download | libhevc-bf58c9a88529b4d10985d95d83c9bbdc2bab789a.tar.gz |
Remove useless `neon:` clause.
There hasn't been a non-neon platform build in years.
Bug: 330929681
Test: Builds
Change-Id: I48fcc213c5faf93ce06a3345d00316cda0925ea5
-rw-r--r-- | Android.bp | 329 |
1 files changed, 157 insertions, 172 deletions
@@ -219,98 +219,86 @@ cc_library_static { srcs: [ "decoder/arm/ihevcd_function_selector.c", "decoder/arm/ihevcd_function_selector_noneon.c", + "common/arm/ihevc_deblk_chroma_horz.s", + "common/arm/ihevc_deblk_chroma_vert.s", + "common/arm/ihevc_deblk_luma_horz.s", + "common/arm/ihevc_deblk_luma_vert.s", + "common/arm/ihevc_inter_pred_chroma_copy.s", + "common/arm/ihevc_inter_pred_chroma_copy_w16out.s", + "common/arm/ihevc_inter_pred_chroma_horz.s", + "common/arm/ihevc_inter_pred_chroma_horz_w16out.s", + "common/arm/ihevc_inter_pred_chroma_vert.s", + "common/arm/ihevc_inter_pred_chroma_vert_w16inp.s", + "common/arm/ihevc_inter_pred_chroma_vert_w16inp_w16out.s", + "common/arm/ihevc_inter_pred_chroma_vert_w16out.s", + "common/arm/ihevc_inter_pred_filters_luma_horz.s", + "common/arm/ihevc_inter_pred_filters_luma_vert.s", + "common/arm/ihevc_inter_pred_filters_luma_vert_w16inp.s", + "common/arm/ihevc_inter_pred_luma_copy.s", + "common/arm/ihevc_inter_pred_luma_copy_w16out.s", + "common/arm/ihevc_inter_pred_luma_horz_w16out.s", + "common/arm/ihevc_inter_pred_luma_vert_w16inp_w16out.s", + "common/arm/ihevc_intra_pred_chroma_dc.s", + "common/arm/ihevc_intra_pred_chroma_horz.s", + "common/arm/ihevc_intra_pred_chroma_mode2.s", + "common/arm/ihevc_intra_pred_chroma_mode_18_34.s", + "common/arm/ihevc_intra_pred_chroma_mode_27_to_33.s", + "common/arm/ihevc_intra_pred_chroma_mode_3_to_9.s", + "common/arm/ihevc_intra_pred_chroma_planar.s", + "common/arm/ihevc_intra_pred_chroma_ver.s", + "common/arm/ihevc_intra_pred_filters_chroma_mode_11_to_17.s", + "common/arm/ihevc_intra_pred_filters_chroma_mode_19_to_25.s", + "common/arm/ihevc_intra_pred_filters_luma_mode_11_to_17.s", + "common/arm/ihevc_intra_pred_filters_luma_mode_19_to_25.s", + "common/arm/ihevc_intra_pred_filters_neon_intr.c", + "common/arm/ihevc_intra_pred_luma_dc.s", + "common/arm/ihevc_intra_pred_luma_horz.s", + "common/arm/ihevc_intra_pred_luma_mode2.s", + "common/arm/ihevc_intra_pred_luma_mode_18_34.s", + "common/arm/ihevc_intra_pred_luma_mode_27_to_33.s", + "common/arm/ihevc_intra_pred_luma_mode_3_to_9.s", + "common/arm/ihevc_intra_pred_luma_planar.s", + "common/arm/ihevc_intra_pred_luma_vert.s", + "common/arm/ihevc_intra_ref_substitution_a9q.c", + "common/arm/ihevc_itrans_recon_16x16.s", + "common/arm/ihevc_itrans_recon_32x32.s", + "common/arm/ihevc_itrans_recon_4x4.s", + "common/arm/ihevc_itrans_recon_4x4_ttype1.s", + "common/arm/ihevc_itrans_recon_8x8.s", + "common/arm/ihevc_mem_fns.s", + "common/arm/ihevc_padding.s", + "common/arm/ihevc_sao_band_offset_chroma.s", + "common/arm/ihevc_sao_band_offset_luma.s", + "common/arm/ihevc_sao_edge_offset_class0.s", + "common/arm/ihevc_sao_edge_offset_class0_chroma.s", + "common/arm/ihevc_sao_edge_offset_class1.s", + "common/arm/ihevc_sao_edge_offset_class1_chroma.s", + "common/arm/ihevc_sao_edge_offset_class2.s", + "common/arm/ihevc_sao_edge_offset_class2_chroma.s", + "common/arm/ihevc_sao_edge_offset_class3.s", + "common/arm/ihevc_sao_edge_offset_class3_chroma.s", + "common/arm/ihevc_weighted_pred_bi.s", + "common/arm/ihevc_weighted_pred_bi_default.s", + "common/arm/ihevc_weighted_pred_neon_intr.c", + "common/arm/ihevc_weighted_pred_uni.s", + "decoder/arm/ihevcd_fmt_conv_420sp_to_420p.s", + "decoder/arm/ihevcd_fmt_conv_420sp_to_420sp.s", + "decoder/arm/ihevcd_fmt_conv_420sp_to_rgba8888.s", + "decoder/arm/ihevcd_function_selector_a9q.c", + "decoder/arm/ihevcd_itrans_recon_dc_chroma.s", + "decoder/arm/ihevcd_itrans_recon_dc_luma.s", ], cflags: [ + // Modules coded with neon intrinsics are not not included in Android Build. "-DDISABLE_NEONINTR", "-DARM", "-DARMGCC", "-fno-tree-vectorize", - - // These will be overriden by armv7_a_neon - "-DDISABLE_NEON", - "-DDEFAULT_ARCH=D_ARCH_ARM_NONEON", + "-DDEFAULT_ARCH=D_ARCH_ARM_A9Q", ], instruction_set: "arm", - - neon: { - srcs: [ - "common/arm/ihevc_deblk_chroma_horz.s", - "common/arm/ihevc_deblk_chroma_vert.s", - "common/arm/ihevc_deblk_luma_horz.s", - "common/arm/ihevc_deblk_luma_vert.s", - "common/arm/ihevc_inter_pred_chroma_copy.s", - "common/arm/ihevc_inter_pred_chroma_copy_w16out.s", - "common/arm/ihevc_inter_pred_chroma_horz.s", - "common/arm/ihevc_inter_pred_chroma_horz_w16out.s", - "common/arm/ihevc_inter_pred_chroma_vert.s", - "common/arm/ihevc_inter_pred_chroma_vert_w16inp.s", - "common/arm/ihevc_inter_pred_chroma_vert_w16inp_w16out.s", - "common/arm/ihevc_inter_pred_chroma_vert_w16out.s", - "common/arm/ihevc_inter_pred_filters_luma_horz.s", - "common/arm/ihevc_inter_pred_filters_luma_vert.s", - "common/arm/ihevc_inter_pred_filters_luma_vert_w16inp.s", - "common/arm/ihevc_inter_pred_luma_copy.s", - "common/arm/ihevc_inter_pred_luma_copy_w16out.s", - "common/arm/ihevc_inter_pred_luma_horz_w16out.s", - "common/arm/ihevc_inter_pred_luma_vert_w16inp_w16out.s", - "common/arm/ihevc_intra_pred_chroma_dc.s", - "common/arm/ihevc_intra_pred_chroma_horz.s", - "common/arm/ihevc_intra_pred_chroma_mode2.s", - "common/arm/ihevc_intra_pred_chroma_mode_18_34.s", - "common/arm/ihevc_intra_pred_chroma_mode_27_to_33.s", - "common/arm/ihevc_intra_pred_chroma_mode_3_to_9.s", - "common/arm/ihevc_intra_pred_chroma_planar.s", - "common/arm/ihevc_intra_pred_chroma_ver.s", - "common/arm/ihevc_intra_pred_filters_chroma_mode_11_to_17.s", - "common/arm/ihevc_intra_pred_filters_chroma_mode_19_to_25.s", - "common/arm/ihevc_intra_pred_filters_luma_mode_11_to_17.s", - "common/arm/ihevc_intra_pred_filters_luma_mode_19_to_25.s", - "common/arm/ihevc_intra_pred_filters_neon_intr.c", - "common/arm/ihevc_intra_pred_luma_dc.s", - "common/arm/ihevc_intra_pred_luma_horz.s", - "common/arm/ihevc_intra_pred_luma_mode2.s", - "common/arm/ihevc_intra_pred_luma_mode_18_34.s", - "common/arm/ihevc_intra_pred_luma_mode_27_to_33.s", - "common/arm/ihevc_intra_pred_luma_mode_3_to_9.s", - "common/arm/ihevc_intra_pred_luma_planar.s", - "common/arm/ihevc_intra_pred_luma_vert.s", - "common/arm/ihevc_intra_ref_substitution_a9q.c", - "common/arm/ihevc_itrans_recon_16x16.s", - "common/arm/ihevc_itrans_recon_32x32.s", - "common/arm/ihevc_itrans_recon_4x4.s", - "common/arm/ihevc_itrans_recon_4x4_ttype1.s", - "common/arm/ihevc_itrans_recon_8x8.s", - "common/arm/ihevc_mem_fns.s", - "common/arm/ihevc_padding.s", - "common/arm/ihevc_sao_band_offset_chroma.s", - "common/arm/ihevc_sao_band_offset_luma.s", - "common/arm/ihevc_sao_edge_offset_class0.s", - "common/arm/ihevc_sao_edge_offset_class0_chroma.s", - "common/arm/ihevc_sao_edge_offset_class1.s", - "common/arm/ihevc_sao_edge_offset_class1_chroma.s", - "common/arm/ihevc_sao_edge_offset_class2.s", - "common/arm/ihevc_sao_edge_offset_class2_chroma.s", - "common/arm/ihevc_sao_edge_offset_class3.s", - "common/arm/ihevc_sao_edge_offset_class3_chroma.s", - "common/arm/ihevc_weighted_pred_bi.s", - "common/arm/ihevc_weighted_pred_bi_default.s", - "common/arm/ihevc_weighted_pred_neon_intr.c", - "common/arm/ihevc_weighted_pred_uni.s", - "decoder/arm/ihevcd_fmt_conv_420sp_to_420p.s", - "decoder/arm/ihevcd_fmt_conv_420sp_to_420sp.s", - "decoder/arm/ihevcd_fmt_conv_420sp_to_rgba8888.s", - "decoder/arm/ihevcd_function_selector_a9q.c", - "decoder/arm/ihevcd_itrans_recon_dc_chroma.s", - "decoder/arm/ihevcd_itrans_recon_dc_luma.s", - ], - cflags: [ - "-UDISABLE_NEON", - "-UDEFAULT_ARCH", - "-DDEFAULT_ARCH=D_ARCH_ARM_A9Q", - ], - }, }, x86_64: { @@ -689,97 +677,94 @@ cc_library_static { "encoder/arm", ], - instruction_set: "arm", + srcs: [ + "common/arm/ihevc_deblk_chroma_horz.s", + "common/arm/ihevc_deblk_chroma_vert.s", + "common/arm/ihevc_deblk_luma_horz.s", + "common/arm/ihevc_deblk_luma_vert.s", + "common/arm/ihevc_inter_pred_chroma_copy.s", + "common/arm/ihevc_inter_pred_chroma_copy_w16out.s", + "common/arm/ihevc_inter_pred_chroma_horz.s", + "common/arm/ihevc_inter_pred_chroma_horz_w16out.s", + "common/arm/ihevc_inter_pred_chroma_vert.s", + "common/arm/ihevc_inter_pred_chroma_vert_w16inp.s", + "common/arm/ihevc_inter_pred_chroma_vert_w16inp_w16out.s", + "common/arm/ihevc_inter_pred_chroma_vert_w16out.s", + "common/arm/ihevc_inter_pred_filters_luma_horz.s", + "common/arm/ihevc_inter_pred_filters_luma_vert.s", + "common/arm/ihevc_inter_pred_filters_luma_vert_w16inp.s", + "common/arm/ihevc_inter_pred_luma_copy.s", + "common/arm/ihevc_inter_pred_luma_copy_w16out.s", + "common/arm/ihevc_inter_pred_luma_horz_w16out.s", + "common/arm/ihevc_inter_pred_luma_vert_w16inp_w16out.s", + "common/arm/ihevc_intra_pred_chroma_dc.s", + "common/arm/ihevc_intra_pred_chroma_horz.s", + "common/arm/ihevc_intra_pred_chroma_mode2.s", + "common/arm/ihevc_intra_pred_chroma_mode_18_34.s", + "common/arm/ihevc_intra_pred_chroma_mode_27_to_33.s", + "common/arm/ihevc_intra_pred_chroma_mode_3_to_9.s", + "common/arm/ihevc_intra_pred_chroma_planar.s", + "common/arm/ihevc_intra_pred_chroma_ver.s", + "common/arm/ihevc_intra_pred_filters_chroma_mode_11_to_17.s", + "common/arm/ihevc_intra_pred_filters_chroma_mode_19_to_25.s", + "common/arm/ihevc_intra_pred_filters_luma_mode_11_to_17.s", + "common/arm/ihevc_intra_pred_filters_luma_mode_19_to_25.s", + "common/arm/ihevc_intra_pred_filters_neon_intr.c", + "common/arm/ihevc_intra_pred_luma_dc.s", + "common/arm/ihevc_intra_pred_luma_horz.s", + "common/arm/ihevc_intra_pred_luma_mode2.s", + "common/arm/ihevc_intra_pred_luma_mode_18_34.s", + "common/arm/ihevc_intra_pred_luma_mode_27_to_33.s", + "common/arm/ihevc_intra_pred_luma_mode_3_to_9.s", + "common/arm/ihevc_intra_pred_luma_planar.s", + "common/arm/ihevc_intra_pred_luma_vert.s", + "common/arm/ihevc_intra_ref_substitution_a9q.c", + "common/arm/ihevc_itrans_recon_16x16.s", + "common/arm/ihevc_itrans_recon_32x32.s", + "common/arm/ihevc_itrans_recon_4x4.s", + "common/arm/ihevc_itrans_recon_4x4_ttype1.s", + "common/arm/ihevc_itrans_recon_8x8.s", + "common/arm/ihevc_mem_fns.s", + "common/arm/ihevc_padding.s", + "common/arm/ihevc_quant_iquant_ssd_neon_intr.c", + "common/arm/ihevc_resi_trans.s", + "common/arm/ihevc_resi_trans_32x32_a9q.s", + "common/arm/ihevc_resi_trans_neon.c", + "common/arm/ihevc_resi_trans_neon_32x32.c", + "common/arm/ihevc_sao_band_offset_chroma.s", + "common/arm/ihevc_sao_band_offset_luma.s", + "common/arm/ihevc_sao_edge_offset_class0.s", + "common/arm/ihevc_sao_edge_offset_class0_chroma.s", + "common/arm/ihevc_sao_edge_offset_class1.s", + "common/arm/ihevc_sao_edge_offset_class1_chroma.s", + "common/arm/ihevc_sao_edge_offset_class2.s", + "common/arm/ihevc_sao_edge_offset_class2_chroma.s", + "common/arm/ihevc_sao_edge_offset_class3.s", + "common/arm/ihevc_sao_edge_offset_class3_chroma.s", + "common/arm/ihevc_weighted_pred_bi.s", + "common/arm/ihevc_weighted_pred_bi_default.s", + "common/arm/ihevc_weighted_pred_neon_intr.c", + "common/arm/ihevc_weighted_pred_uni.s", + "encoder/arm/ihevce_coarse_layer_sad_neon.c", + "encoder/arm/ihevce_common_utils_neon.c", + "encoder/arm/ihevce_copy_neon.c", + "encoder/arm/ihevce_had_compute_neon.c", + "encoder/arm/ihevce_hme_utils_neon.c", + "encoder/arm/ihevce_itrans_recon_neon.c", + "encoder/arm/ihevce_me_neon.c", + "encoder/arm/ihevce_sad_compute_neon.c", + "encoder/arm/ihevce_scale_by_2_neon.c", + "encoder/arm/ihevce_scan_coeffs_neon.c", + "encoder/arm/ihevce_ssd_and_sad_calculator_neon.c", + "encoder/arm/ihevce_ssd_calculator_neon.c", + "encoder/arm/ihevce_subpel_neon.c", + ], - neon: { - srcs: [ - "common/arm/ihevc_deblk_chroma_horz.s", - "common/arm/ihevc_deblk_chroma_vert.s", - "common/arm/ihevc_deblk_luma_horz.s", - "common/arm/ihevc_deblk_luma_vert.s", - "common/arm/ihevc_inter_pred_chroma_copy.s", - "common/arm/ihevc_inter_pred_chroma_copy_w16out.s", - "common/arm/ihevc_inter_pred_chroma_horz.s", - "common/arm/ihevc_inter_pred_chroma_horz_w16out.s", - "common/arm/ihevc_inter_pred_chroma_vert.s", - "common/arm/ihevc_inter_pred_chroma_vert_w16inp.s", - "common/arm/ihevc_inter_pred_chroma_vert_w16inp_w16out.s", - "common/arm/ihevc_inter_pred_chroma_vert_w16out.s", - "common/arm/ihevc_inter_pred_filters_luma_horz.s", - "common/arm/ihevc_inter_pred_filters_luma_vert.s", - "common/arm/ihevc_inter_pred_filters_luma_vert_w16inp.s", - "common/arm/ihevc_inter_pred_luma_copy.s", - "common/arm/ihevc_inter_pred_luma_copy_w16out.s", - "common/arm/ihevc_inter_pred_luma_horz_w16out.s", - "common/arm/ihevc_inter_pred_luma_vert_w16inp_w16out.s", - "common/arm/ihevc_intra_pred_chroma_dc.s", - "common/arm/ihevc_intra_pred_chroma_horz.s", - "common/arm/ihevc_intra_pred_chroma_mode2.s", - "common/arm/ihevc_intra_pred_chroma_mode_18_34.s", - "common/arm/ihevc_intra_pred_chroma_mode_27_to_33.s", - "common/arm/ihevc_intra_pred_chroma_mode_3_to_9.s", - "common/arm/ihevc_intra_pred_chroma_planar.s", - "common/arm/ihevc_intra_pred_chroma_ver.s", - "common/arm/ihevc_intra_pred_filters_chroma_mode_11_to_17.s", - "common/arm/ihevc_intra_pred_filters_chroma_mode_19_to_25.s", - "common/arm/ihevc_intra_pred_filters_luma_mode_11_to_17.s", - "common/arm/ihevc_intra_pred_filters_luma_mode_19_to_25.s", - "common/arm/ihevc_intra_pred_filters_neon_intr.c", - "common/arm/ihevc_intra_pred_luma_dc.s", - "common/arm/ihevc_intra_pred_luma_horz.s", - "common/arm/ihevc_intra_pred_luma_mode2.s", - "common/arm/ihevc_intra_pred_luma_mode_18_34.s", - "common/arm/ihevc_intra_pred_luma_mode_27_to_33.s", - "common/arm/ihevc_intra_pred_luma_mode_3_to_9.s", - "common/arm/ihevc_intra_pred_luma_planar.s", - "common/arm/ihevc_intra_pred_luma_vert.s", - "common/arm/ihevc_intra_ref_substitution_a9q.c", - "common/arm/ihevc_itrans_recon_16x16.s", - "common/arm/ihevc_itrans_recon_32x32.s", - "common/arm/ihevc_itrans_recon_4x4.s", - "common/arm/ihevc_itrans_recon_4x4_ttype1.s", - "common/arm/ihevc_itrans_recon_8x8.s", - "common/arm/ihevc_mem_fns.s", - "common/arm/ihevc_padding.s", - "common/arm/ihevc_quant_iquant_ssd_neon_intr.c", - "common/arm/ihevc_resi_trans.s", - "common/arm/ihevc_resi_trans_32x32_a9q.s", - "common/arm/ihevc_resi_trans_neon.c", - "common/arm/ihevc_resi_trans_neon_32x32.c", - "common/arm/ihevc_sao_band_offset_chroma.s", - "common/arm/ihevc_sao_band_offset_luma.s", - "common/arm/ihevc_sao_edge_offset_class0.s", - "common/arm/ihevc_sao_edge_offset_class0_chroma.s", - "common/arm/ihevc_sao_edge_offset_class1.s", - "common/arm/ihevc_sao_edge_offset_class1_chroma.s", - "common/arm/ihevc_sao_edge_offset_class2.s", - "common/arm/ihevc_sao_edge_offset_class2_chroma.s", - "common/arm/ihevc_sao_edge_offset_class3.s", - "common/arm/ihevc_sao_edge_offset_class3_chroma.s", - "common/arm/ihevc_weighted_pred_bi.s", - "common/arm/ihevc_weighted_pred_bi_default.s", - "common/arm/ihevc_weighted_pred_neon_intr.c", - "common/arm/ihevc_weighted_pred_uni.s", - "encoder/arm/ihevce_coarse_layer_sad_neon.c", - "encoder/arm/ihevce_common_utils_neon.c", - "encoder/arm/ihevce_copy_neon.c", - "encoder/arm/ihevce_had_compute_neon.c", - "encoder/arm/ihevce_hme_utils_neon.c", - "encoder/arm/ihevce_itrans_recon_neon.c", - "encoder/arm/ihevce_me_neon.c", - "encoder/arm/ihevce_sad_compute_neon.c", - "encoder/arm/ihevce_scale_by_2_neon.c", - "encoder/arm/ihevce_scan_coeffs_neon.c", - "encoder/arm/ihevce_ssd_and_sad_calculator_neon.c", - "encoder/arm/ihevce_ssd_calculator_neon.c", - "encoder/arm/ihevce_subpel_neon.c", - ], - - cflags: [ - "-DENABLE_NEON", - "-DARM", - ], - }, + cflags: [ + "-DENABLE_NEON", + "-DARM", + ], + instruction_set: "arm", }, x86_64: { |