libhevc: tidy up android bp

sort listings in alphabetical order

Test: Build
Change-Id: Iddc937c72cebed88aad3d14f222f61dac904938b

1 files changed, 216 insertions, 216 deletions

diff --git a/Android.bp b/Android.bp
index c5f1cd2..f969183 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,64 +59,64 @@ cc_library_static {
     ],
 
     srcs: [
-        "common/ihevc_quant_tables.c",
-        "common/ihevc_inter_pred_filters.c",
-        "common/ihevc_weighted_pred.c",
-        "common/ihevc_padding.c",
-        "common/ihevc_deblk_edge_filter.c",
-        "common/ihevc_deblk_tables.c",
+        "common/ihevc_buf_mgr.c",
         "common/ihevc_cabac_tables.c",
-        "common/ihevc_common_tables.c",
-        "common/ihevc_intra_pred_filters.c",
         "common/ihevc_chroma_intra_pred_filters.c",
-        "common/ihevc_mem_fns.c",
-        "common/ihevc_sao.c",
-        "common/ihevc_trans_tables.c",
-        "common/ihevc_recon.c",
-        "common/ihevc_itrans.c",
-        "common/ihevc_itrans_recon.c",
-        "common/ihevc_iquant_recon.c",
-        "common/ihevc_iquant_itrans_recon.c",
-        "common/ihevc_itrans_recon_32x32.c",
-        "common/ihevc_itrans_recon_16x16.c",
-        "common/ihevc_itrans_recon_8x8.c",
-        "common/ihevc_chroma_itrans_recon.c",
-        "common/ihevc_chroma_iquant_recon.c",
         "common/ihevc_chroma_iquant_itrans_recon.c",
-        "common/ihevc_chroma_recon.c",
+        "common/ihevc_chroma_iquant_recon.c",
+        "common/ihevc_chroma_itrans_recon.c",
         "common/ihevc_chroma_itrans_recon_16x16.c",
         "common/ihevc_chroma_itrans_recon_8x8.c",
-        "common/ihevc_buf_mgr.c",
+        "common/ihevc_chroma_recon.c",
+        "common/ihevc_common_tables.c",
+        "common/ihevc_deblk_edge_filter.c",
+        "common/ihevc_deblk_tables.c",
         "common/ihevc_disp_mgr.c",
         "common/ihevc_dpb_mgr.c",
+        "common/ihevc_inter_pred_filters.c",
+        "common/ihevc_intra_pred_filters.c",
+        "common/ihevc_iquant_itrans_recon.c",
+        "common/ihevc_iquant_recon.c",
+        "common/ihevc_itrans.c",
+        "common/ihevc_itrans_recon.c",
+        "common/ihevc_itrans_recon_16x16.c",
+        "common/ihevc_itrans_recon_32x32.c",
+        "common/ihevc_itrans_recon_8x8.c",
+        "common/ihevc_mem_fns.c",
+        "common/ihevc_padding.c",
+        "common/ihevc_quant_tables.c",
+        "common/ihevc_recon.c",
+        "common/ihevc_sao.c",
+        "common/ihevc_trans_tables.c",
+        "common/ihevc_weighted_pred.c",
         "common/ithread.c",
-        "decoder/ihevcd_version.c",
         "decoder/ihevcd_api.c",
+        "decoder/ihevcd_bitstream.c",
+        "decoder/ihevcd_boundary_strength.c",
+        "decoder/ihevcd_cabac.c",
+        "decoder/ihevcd_common_tables.c",
+        "decoder/ihevcd_deblk.c",
         "decoder/ihevcd_decode.c",
+        "decoder/ihevcd_fmt_conv.c",
+        "decoder/ihevcd_get_mv.c",
+        "decoder/ihevcd_ilf_padding.c",
+        "decoder/ihevcd_inter_pred.c",
+        "decoder/ihevcd_intra_pred_mode_prediction.c",
+        "decoder/ihevcd_iquant_itrans_recon_ctb.c",
+        "decoder/ihevcd_itrans_recon_dc.c",
+        "decoder/ihevcd_job_queue.c",
+        "decoder/ihevcd_mv_merge.c",
+        "decoder/ihevcd_mv_pred.c",
         "decoder/ihevcd_nal.c",
-        "decoder/ihevcd_bitstream.c",
         "decoder/ihevcd_parse_headers.c",
-        "decoder/ihevcd_parse_slice_header.c",
-        "decoder/ihevcd_parse_slice.c",
         "decoder/ihevcd_parse_residual.c",
-        "decoder/ihevcd_cabac.c",
-        "decoder/ihevcd_intra_pred_mode_prediction.c",
+        "decoder/ihevcd_parse_slice.c",
+        "decoder/ihevcd_parse_slice_header.c",
         "decoder/ihevcd_process_slice.c",
-        "decoder/ihevcd_utils.c",
-        "decoder/ihevcd_job_queue.c",
         "decoder/ihevcd_ref_list.c",
-        "decoder/ihevcd_get_mv.c",
-        "decoder/ihevcd_mv_pred.c",
-        "decoder/ihevcd_mv_merge.c",
-        "decoder/ihevcd_iquant_itrans_recon_ctb.c",
-        "decoder/ihevcd_itrans_recon_dc.c",
-        "decoder/ihevcd_common_tables.c",
-        "decoder/ihevcd_boundary_strength.c",
-        "decoder/ihevcd_deblk.c",
-        "decoder/ihevcd_inter_pred.c",
         "decoder/ihevcd_sao.c",
-        "decoder/ihevcd_ilf_padding.c",
-        "decoder/ihevcd_fmt_conv.c",
+        "decoder/ihevcd_utils.c",
+        "decoder/ihevcd_version.c",
     ],
 
     arch: {
@@ -130,90 +130,90 @@ cc_library_static {
                 "-DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC",
             ],
             local_include_dirs: [
-                "decoder/arm",
                 "common/arm",
-                "decoder/arm64",
                 "common/arm64",
+                "decoder/arm",
+                "decoder/arm64",
             ],
 
             srcs: [
-                "decoder/arm/ihevcd_function_selector.c",
-                "decoder/arm/ihevcd_function_selector_noneon.c",
-                "decoder/arm64/ihevcd_function_selector_av8.c",
                 "common/arm/ihevc_intra_pred_filters_neon_intr.c",
                 "common/arm/ihevc_weighted_pred_neon_intr.c",
-                "common/arm64/ihevc_mem_fns.s",
-                "common/arm64/ihevc_itrans_recon_32x32.s",
-                "common/arm64/ihevc_weighted_pred_bi_default.s",
-                "common/arm64/ihevc_weighted_pred_bi.s",
-                "common/arm64/ihevc_weighted_pred_uni.s",
+                "common/arm64/ihevc_deblk_chroma_horz.s",
+                "common/arm64/ihevc_deblk_chroma_vert.s",
                 "common/arm64/ihevc_deblk_luma_horz.s",
                 "common/arm64/ihevc_deblk_luma_vert.s",
-                "common/arm64/ihevc_deblk_chroma_vert.s",
-                "common/arm64/ihevc_deblk_chroma_horz.s",
-                "common/arm64/ihevc_sao_band_offset_luma.s",
-                "common/arm64/ihevc_sao_band_offset_chroma.s",
-                "common/arm64/ihevc_sao_edge_offset_class0.s",
-                "common/arm64/ihevc_sao_edge_offset_class0_chroma.s",
-                "common/arm64/ihevc_sao_edge_offset_class1.s",
-                "common/arm64/ihevc_sao_edge_offset_class1_chroma.s",
-                "common/arm64/ihevc_sao_edge_offset_class2.s",
-                "common/arm64/ihevc_sao_edge_offset_class2_chroma.s",
-                "common/arm64/ihevc_sao_edge_offset_class3.s",
-                "common/arm64/ihevc_sao_edge_offset_class3_chroma.s",
-                "common/arm64/ihevc_inter_pred_luma_horz_w16out.s",
-                "common/arm64/ihevc_inter_pred_filters_luma_horz.s",
-                "common/arm64/ihevc_inter_pred_filters_luma_vert.s",
+                "common/arm64/ihevc_inter_pred_chroma_copy.s",
+                "common/arm64/ihevc_inter_pred_chroma_copy_w16out.s",
                 "common/arm64/ihevc_inter_pred_chroma_horz.s",
                 "common/arm64/ihevc_inter_pred_chroma_horz_w16out.s",
                 "common/arm64/ihevc_inter_pred_chroma_vert.s",
-                "common/arm64/ihevc_inter_pred_chroma_vert_w16out.s",
                 "common/arm64/ihevc_inter_pred_chroma_vert_w16inp.s",
                 "common/arm64/ihevc_inter_pred_chroma_vert_w16inp_w16out.s",
+                "common/arm64/ihevc_inter_pred_chroma_vert_w16out.s",
+                "common/arm64/ihevc_inter_pred_filters_luma_horz.s",
+                "common/arm64/ihevc_inter_pred_filters_luma_vert.s",
                 "common/arm64/ihevc_inter_pred_filters_luma_vert_w16inp.s",
                 "common/arm64/ihevc_inter_pred_filters_luma_vert_w16out.s",
-                "common/arm64/ihevc_inter_pred_luma_vert_w16inp_w16out.s",
-                "common/arm64/ihevc_inter_pred_luma_copy_w16out.s",
                 "common/arm64/ihevc_inter_pred_luma_copy.s",
-                "common/arm64/ihevc_inter_pred_chroma_copy.s",
-                "common/arm64/ihevc_inter_pred_chroma_copy_w16out.s",
-                "common/arm64/ihevc_itrans_recon_4x4_ttype1.s",
-                "common/arm64/ihevc_itrans_recon_4x4.s",
-                "common/arm64/ihevc_itrans_recon_8x8.s",
-                "common/arm64/ihevc_itrans_recon_16x16.s",
-                "common/arm64/ihevc_intra_pred_chroma_planar.s",
+                "common/arm64/ihevc_inter_pred_luma_copy_w16out.s",
+                "common/arm64/ihevc_inter_pred_luma_horz_w16out.s",
+                "common/arm64/ihevc_inter_pred_luma_vert_w16inp_w16out.s",
                 "common/arm64/ihevc_intra_pred_chroma_dc.s",
                 "common/arm64/ihevc_intra_pred_chroma_horz.s",
-                "common/arm64/ihevc_intra_pred_chroma_ver.s",
                 "common/arm64/ihevc_intra_pred_chroma_mode2.s",
                 "common/arm64/ihevc_intra_pred_chroma_mode_18_34.s",
+                "common/arm64/ihevc_intra_pred_chroma_mode_27_to_33.s",
+                "common/arm64/ihevc_intra_pred_chroma_mode_3_to_9.s",
+                "common/arm64/ihevc_intra_pred_chroma_planar.s",
+                "common/arm64/ihevc_intra_pred_chroma_ver.s",
                 "common/arm64/ihevc_intra_pred_filters_chroma_mode_11_to_17.s",
                 "common/arm64/ihevc_intra_pred_filters_chroma_mode_19_to_25.s",
-                "common/arm64/ihevc_intra_pred_chroma_mode_3_to_9.s",
-                "common/arm64/ihevc_intra_pred_chroma_mode_27_to_33.s",
-                "common/arm64/ihevc_intra_pred_luma_planar.s",
+                "common/arm64/ihevc_intra_pred_filters_luma_mode_11_to_17.s",
+                "common/arm64/ihevc_intra_pred_filters_luma_mode_19_to_25.s",
+                "common/arm64/ihevc_intra_pred_luma_dc.s",
                 "common/arm64/ihevc_intra_pred_luma_horz.s",
                 "common/arm64/ihevc_intra_pred_luma_mode2.s",
-                "common/arm64/ihevc_intra_pred_luma_mode_27_to_33.s",
                 "common/arm64/ihevc_intra_pred_luma_mode_18_34.s",
-                "common/arm64/ihevc_intra_pred_luma_vert.s",
-                "common/arm64/ihevc_intra_pred_luma_dc.s",
-                "common/arm64/ihevc_intra_pred_filters_luma_mode_11_to_17.s",
-                "common/arm64/ihevc_intra_pred_filters_luma_mode_19_to_25.s",
+                "common/arm64/ihevc_intra_pred_luma_mode_27_to_33.s",
                 "common/arm64/ihevc_intra_pred_luma_mode_3_to_9.s",
+                "common/arm64/ihevc_intra_pred_luma_planar.s",
+                "common/arm64/ihevc_intra_pred_luma_vert.s",
+                "common/arm64/ihevc_itrans_recon_16x16.s",
+                "common/arm64/ihevc_itrans_recon_32x32.s",
+                "common/arm64/ihevc_itrans_recon_4x4.s",
+                "common/arm64/ihevc_itrans_recon_4x4_ttype1.s",
+                "common/arm64/ihevc_itrans_recon_8x8.s",
+                "common/arm64/ihevc_mem_fns.s",
                 "common/arm64/ihevc_padding.s",
-                "decoder/arm64/ihevcd_itrans_recon_dc_luma.s",
-                "decoder/arm64/ihevcd_itrans_recon_dc_chroma.s",
+                "common/arm64/ihevc_sao_band_offset_chroma.s",
+                "common/arm64/ihevc_sao_band_offset_luma.s",
+                "common/arm64/ihevc_sao_edge_offset_class0.s",
+                "common/arm64/ihevc_sao_edge_offset_class0_chroma.s",
+                "common/arm64/ihevc_sao_edge_offset_class1.s",
+                "common/arm64/ihevc_sao_edge_offset_class1_chroma.s",
+                "common/arm64/ihevc_sao_edge_offset_class2.s",
+                "common/arm64/ihevc_sao_edge_offset_class2_chroma.s",
+                "common/arm64/ihevc_sao_edge_offset_class3.s",
+                "common/arm64/ihevc_sao_edge_offset_class3_chroma.s",
+                "common/arm64/ihevc_weighted_pred_bi.s",
+                "common/arm64/ihevc_weighted_pred_bi_default.s",
+                "common/arm64/ihevc_weighted_pred_uni.s",
+                "decoder/arm/ihevcd_function_selector.c",
+                "decoder/arm/ihevcd_function_selector_noneon.c",
                 "decoder/arm64/ihevcd_fmt_conv_420sp_to_420p.s",
                 "decoder/arm64/ihevcd_fmt_conv_420sp_to_420sp.s",
                 "decoder/arm64/ihevcd_fmt_conv_420sp_to_rgba8888.s",
+                "decoder/arm64/ihevcd_function_selector_av8.c",
+                "decoder/arm64/ihevcd_itrans_recon_dc_chroma.s",
+                "decoder/arm64/ihevcd_itrans_recon_dc_luma.s",
             ],
         },
 
         arm: {
             local_include_dirs: [
-                "decoder/arm",
                 "common/arm",
+                "decoder/arm",
             ],
 
             srcs: [
@@ -236,74 +236,74 @@ cc_library_static {
 
             neon: {
                 srcs: [
-                    "decoder/arm/ihevcd_function_selector_a9q.c",
-                    "common/arm/ihevc_intra_ref_substitution_a9q.c",
-                    "common/arm/ihevc_intra_pred_filters_neon_intr.c",
-                    "common/arm/ihevc_weighted_pred_neon_intr.c",
-                    "common/arm/ihevc_mem_fns.s",
-                    "common/arm/ihevc_itrans_recon_32x32.s",
-                    "common/arm/ihevc_weighted_pred_bi_default.s",
-                    "common/arm/ihevc_weighted_pred_bi.s",
-                    "common/arm/ihevc_weighted_pred_uni.s",
+                    "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_deblk_chroma_vert.s",
-                    "common/arm/ihevc_deblk_chroma_horz.s",
-                    "common/arm/ihevc_sao_band_offset_luma.s",
-                    "common/arm/ihevc_sao_band_offset_chroma.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_inter_pred_luma_horz_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_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_w16out.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_vert_w16inp_w16out.s",
-                    "common/arm/ihevc_inter_pred_luma_copy_w16out.s",
                     "common/arm/ihevc_inter_pred_luma_copy.s",
-                    "common/arm/ihevc_inter_pred_chroma_copy.s",
-                    "common/arm/ihevc_inter_pred_chroma_copy_w16out.s",
-                    "common/arm/ihevc_itrans_recon_4x4_ttype1.s",
-                    "common/arm/ihevc_itrans_recon_4x4.s",
-                    "common/arm/ihevc_itrans_recon_8x8.s",
-                    "common/arm/ihevc_itrans_recon_16x16.s",
-                    "common/arm/ihevc_intra_pred_chroma_planar.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_ver.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_chroma_mode_3_to_9.s",
-                    "common/arm/ihevc_intra_pred_chroma_mode_27_to_33.s",
-                    "common/arm/ihevc_intra_pred_luma_planar.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_27_to_33.s",
                     "common/arm/ihevc_intra_pred_luma_mode_18_34.s",
-                    "common/arm/ihevc_intra_pred_luma_vert.s",
-                    "common/arm/ihevc_intra_pred_luma_dc.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_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",
-                    "decoder/arm/ihevcd_itrans_recon_dc_luma.s",
-                    "decoder/arm/ihevcd_itrans_recon_dc_chroma.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",
@@ -323,37 +323,37 @@ cc_library_static {
             ],
 
             local_include_dirs: [
-                "decoder/x86",
                 "common/x86",
+                "decoder/x86",
             ],
 
             srcs: [
-                "decoder/x86/ihevcd_function_selector.c",
-                "decoder/x86/ihevcd_function_selector_generic.c",
-                "decoder/x86/ihevcd_function_selector_ssse3.c",
-                "decoder/x86/ihevcd_function_selector_sse42.c",
+                "common/x86/ihevc_16x16_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_32x32_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_chroma_intra_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_chroma_intra_pred_filters_ssse3_intr.c",
+                "common/x86/ihevc_deblk_ssse3_intr.c",
+                "common/x86/ihevc_inter_pred_filters_sse42_intr.c",
                 "common/x86/ihevc_inter_pred_filters_ssse3_intr.c",
-                "common/x86/ihevc_weighted_pred_ssse3_intr.c",
+                "common/x86/ihevc_intra_pred_filters_sse42_intr.c",
                 "common/x86/ihevc_intra_pred_filters_ssse3_intr.c",
-                "common/x86/ihevc_chroma_intra_pred_filters_ssse3_intr.c",
-                "common/x86/ihevc_itrans_recon_ssse3_intr.c",
                 "common/x86/ihevc_itrans_recon_16x16_ssse3_intr.c",
                 "common/x86/ihevc_itrans_recon_32x32_ssse3_intr.c",
-                "common/x86/ihevc_sao_ssse3_intr.c",
-                "common/x86/ihevc_deblk_ssse3_intr.c",
-                "common/x86/ihevc_padding_ssse3_intr.c",
+                "common/x86/ihevc_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_itrans_recon_ssse3_intr.c",
                 "common/x86/ihevc_mem_fns_ssse3_intr.c",
-                "decoder/x86/ihevcd_fmt_conv_ssse3_intr.c",
-                "decoder/x86/ihevcd_it_rec_dc_ssse3_intr.c",
-                "common/x86/ihevc_inter_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_padding_ssse3_intr.c",
+                "common/x86/ihevc_sao_ssse3_intr.c",
+                "common/x86/ihevc_tables_x86_intr.c",
                 "common/x86/ihevc_weighted_pred_sse42_intr.c",
-                "common/x86/ihevc_intra_pred_filters_sse42_intr.c",
-                "common/x86/ihevc_chroma_intra_pred_filters_sse42_intr.c",
-                "common/x86/ihevc_itrans_recon_sse42_intr.c",
-                "common/x86/ihevc_16x16_itrans_recon_sse42_intr.c",
-                "common/x86/ihevc_32x32_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_weighted_pred_ssse3_intr.c",
+                "decoder/x86/ihevcd_fmt_conv_ssse3_intr.c",
+                "decoder/x86/ihevcd_function_selector.c",
+                "decoder/x86/ihevcd_function_selector_generic.c",
+                "decoder/x86/ihevcd_function_selector_sse42.c",
+                "decoder/x86/ihevcd_function_selector_ssse3.c",
                 "decoder/x86/ihevcd_it_rec_dc_sse42_intr.c",
-                "common/x86/ihevc_tables_x86_intr.c",
+                "decoder/x86/ihevcd_it_rec_dc_ssse3_intr.c",
             ],
         },
 
@@ -367,37 +367,37 @@ cc_library_static {
             ],
 
             local_include_dirs: [
-                "decoder/x86",
                 "common/x86",
+                "decoder/x86",
             ],
 
             srcs: [
-                "decoder/x86/ihevcd_function_selector.c",
-                "decoder/x86/ihevcd_function_selector_generic.c",
-                "decoder/x86/ihevcd_function_selector_ssse3.c",
-                "decoder/x86/ihevcd_function_selector_sse42.c",
+                "common/x86/ihevc_16x16_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_32x32_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_chroma_intra_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_chroma_intra_pred_filters_ssse3_intr.c",
+                "common/x86/ihevc_deblk_ssse3_intr.c",
+                "common/x86/ihevc_inter_pred_filters_sse42_intr.c",
                 "common/x86/ihevc_inter_pred_filters_ssse3_intr.c",
-                "common/x86/ihevc_weighted_pred_ssse3_intr.c",
+                "common/x86/ihevc_intra_pred_filters_sse42_intr.c",
                 "common/x86/ihevc_intra_pred_filters_ssse3_intr.c",
-                "common/x86/ihevc_chroma_intra_pred_filters_ssse3_intr.c",
-                "common/x86/ihevc_itrans_recon_ssse3_intr.c",
                 "common/x86/ihevc_itrans_recon_16x16_ssse3_intr.c",
                 "common/x86/ihevc_itrans_recon_32x32_ssse3_intr.c",
-                "common/x86/ihevc_sao_ssse3_intr.c",
-                "common/x86/ihevc_deblk_ssse3_intr.c",
-                "common/x86/ihevc_padding_ssse3_intr.c",
+                "common/x86/ihevc_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_itrans_recon_ssse3_intr.c",
                 "common/x86/ihevc_mem_fns_ssse3_intr.c",
-                "decoder/x86/ihevcd_fmt_conv_ssse3_intr.c",
-                "decoder/x86/ihevcd_it_rec_dc_ssse3_intr.c",
-                "common/x86/ihevc_inter_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_padding_ssse3_intr.c",
+                "common/x86/ihevc_sao_ssse3_intr.c",
+                "common/x86/ihevc_tables_x86_intr.c",
                 "common/x86/ihevc_weighted_pred_sse42_intr.c",
-                "common/x86/ihevc_intra_pred_filters_sse42_intr.c",
-                "common/x86/ihevc_chroma_intra_pred_filters_sse42_intr.c",
-                "common/x86/ihevc_itrans_recon_sse42_intr.c",
-                "common/x86/ihevc_16x16_itrans_recon_sse42_intr.c",
-                "common/x86/ihevc_32x32_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_weighted_pred_ssse3_intr.c",
+                "decoder/x86/ihevcd_fmt_conv_ssse3_intr.c",
+                "decoder/x86/ihevcd_function_selector.c",
+                "decoder/x86/ihevcd_function_selector_generic.c",
+                "decoder/x86/ihevcd_function_selector_sse42.c",
+                "decoder/x86/ihevcd_function_selector_ssse3.c",
                 "decoder/x86/ihevcd_it_rec_dc_sse42_intr.c",
-                "common/x86/ihevc_tables_x86_intr.c",
+                "decoder/x86/ihevcd_it_rec_dc_ssse3_intr.c",
             ],
         },
         riscv64: {
@@ -417,7 +417,7 @@ cc_library_static {
         misc_undefined: ["bounds"],
         // Enable CFI if this becomes a shared library.
         cfi: true,
-	config: {
+        config: {
             cfi_assembly_support: true,
         },
         blocklist: "libhevc_blocklist.txt",
@@ -589,31 +589,18 @@ cc_library_static {
         arm64: {
 
             local_include_dirs: [
-                "encoder/arm",
                 "common/arm",
                 "common/arm64",
+                "encoder/arm",
             ],
 
             srcs: [
-                "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",
+                "common/arm/ihevc_intra_pred_filters_neon_intr.c",
+                "common/arm/ihevc_intra_ref_substitution_a9q.c",
+                "common/arm/ihevc_quant_iquant_ssd_neon_intr.c",
                 "common/arm/ihevc_resi_trans_neon.c",
                 "common/arm/ihevc_resi_trans_neon_32x32.c",
-                "common/arm/ihevc_quant_iquant_ssd_neon_intr.c",
-                "common/arm/ihevc_intra_pred_filters_neon_intr.c",
                 "common/arm/ihevc_weighted_pred_neon_intr.c",
-                "common/arm/ihevc_intra_ref_substitution_a9q.c",
                 "common/arm64/ihevc_deblk_chroma_horz.s",
                 "common/arm64/ihevc_deblk_chroma_vert.s",
                 "common/arm64/ihevc_deblk_luma_horz.s",
@@ -674,6 +661,19 @@ cc_library_static {
                 "common/arm64/ihevc_weighted_pred_bi.s",
                 "common/arm64/ihevc_weighted_pred_bi_default.s",
                 "common/arm64/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: [
@@ -685,33 +685,14 @@ cc_library_static {
 
         arm: {
             local_include_dirs: [
-                "encoder/arm",
                 "common/arm",
+                "encoder/arm",
             ],
 
             instruction_set: "arm",
 
             neon: {
                 srcs: [
-                    "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",
-                    "common/arm/ihevc_resi_trans_neon.c",
-                    "common/arm/ihevc_resi_trans_neon_32x32.c",
-                    "common/arm/ihevc_quant_iquant_ssd_neon_intr.c",
-                    "common/arm/ihevc_intra_pred_filters_neon_intr.c",
-                    "common/arm/ihevc_weighted_pred_neon_intr.c",
-                    "common/arm/ihevc_intra_ref_substitution_a9q.c",
                     "common/arm/ihevc_deblk_chroma_horz.s",
                     "common/arm/ihevc_deblk_chroma_vert.s",
                     "common/arm/ihevc_deblk_luma_horz.s",
@@ -743,6 +724,7 @@ cc_library_static {
                     "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",
@@ -751,15 +733,19 @@ cc_library_static {
                     "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_resi_trans.s",
-                    "common/arm/ihevc_resi_trans_32x32_a9q.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",
@@ -770,9 +756,23 @@ cc_library_static {
                     "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_default.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: [
@@ -805,7 +805,7 @@ cc_library_static {
         misc_undefined: ["bounds"],
         // Enable CFI if this becomes a shared library.
         cfi: true,
-	config: {
+        config: {
             cfi_assembly_support: true,
         },
         blocklist: "libhevc_blocklist.txt",