diff options
-rw-r--r-- | test/variance_test.cc | 2 | ||||
-rw-r--r-- | test/vp9_boolcoder_test.cc | 4 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_bilinearfilter_v6.asm (renamed from vp9/common/arm/armv6/bilinearfilter_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_copymem16x16_v6.asm (renamed from vp9/common/arm/armv6/copymem16x16_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_copymem8x4_v6.asm (renamed from vp9/common/arm/armv6/copymem8x4_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_copymem8x8_v6.asm (renamed from vp9/common/arm/armv6/copymem8x8_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_dc_only_idct_add_v6.asm (renamed from vp9/common/arm/armv6/dc_only_idct_add_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_filter_v6.asm (renamed from vp9/common/arm/armv6/filter_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_idct_v6.asm (renamed from vp9/common/arm/armv6/idct_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_iwalsh_v6.asm (renamed from vp9/common/arm/armv6/iwalsh_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_loopfilter_v6.asm (renamed from vp9/common/arm/armv6/loopfilter_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_recon_v6.asm (renamed from vp9/common/arm/armv6/recon_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_simpleloopfilter_v6.asm (renamed from vp9/common/arm/armv6/simpleloopfilter_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/armv6/vp9_sixtappredict8x4_v6.asm (renamed from vp9/common/arm/armv6/sixtappredict8x4_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_bilinearpredict16x16_neon.asm (renamed from vp9/common/arm/neon/bilinearpredict16x16_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_bilinearpredict4x4_neon.asm (renamed from vp9/common/arm/neon/bilinearpredict4x4_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_bilinearpredict8x4_neon.asm (renamed from vp9/common/arm/neon/bilinearpredict8x4_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_bilinearpredict8x8_neon.asm (renamed from vp9/common/arm/neon/bilinearpredict8x8_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_buildintrapredictorsmby_neon.asm (renamed from vp9/common/arm/neon/buildintrapredictorsmby_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_copymem16x16_neon.asm (renamed from vp9/common/arm/neon/copymem16x16_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_copymem8x4_neon.asm (renamed from vp9/common/arm/neon/copymem8x4_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_copymem8x8_neon.asm (renamed from vp9/common/arm/neon/copymem8x8_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_dc_only_idct_add_neon.asm (renamed from vp9/common/arm/neon/dc_only_idct_add_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_iwalsh_neon.asm (renamed from vp9/common/arm/neon/iwalsh_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_loopfilter_neon.asm (renamed from vp9/common/arm/neon/loopfilter_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_loopfiltersimplehorizontaledge_neon.asm (renamed from vp9/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_loopfiltersimpleverticaledge_neon.asm (renamed from vp9/common/arm/neon/loopfiltersimpleverticaledge_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_mbloopfilter_neon.asm (renamed from vp9/common/arm/neon/mbloopfilter_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_recon16x16mb_neon.asm (renamed from vp9/common/arm/neon/recon16x16mb_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_recon2b_neon.asm (renamed from vp9/common/arm/neon/recon2b_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_recon4b_neon.asm (renamed from vp9/common/arm/neon/recon4b_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_recon_neon.c (renamed from vp9/common/arm/neon/recon_neon.c) | 2 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_reconb_neon.asm (renamed from vp9/common/arm/neon/reconb_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_save_neon_reg.asm (renamed from vp9/common/arm/neon/save_neon_reg.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_shortidct4x4llm_1_neon.asm (renamed from vp9/common/arm/neon/shortidct4x4llm_1_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_shortidct4x4llm_neon.asm (renamed from vp9/common/arm/neon/shortidct4x4llm_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_sixtappredict16x16_neon.asm (renamed from vp9/common/arm/neon/sixtappredict16x16_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_sixtappredict4x4_neon.asm (renamed from vp9/common/arm/neon/sixtappredict4x4_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_sixtappredict8x4_neon.asm (renamed from vp9/common/arm/neon/sixtappredict8x4_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/neon/vp9_sixtappredict8x8_neon.asm (renamed from vp9/common/arm/neon/sixtappredict8x8_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/common/arm/vp9_arm_systemdependent.c (renamed from vp9/common/arm/arm_systemdependent.c) | 8 | ||||
-rw-r--r-- | vp9/common/arm/vp9_bilinearfilter_arm.c (renamed from vp9/common/arm/bilinearfilter_arm.c) | 6 | ||||
-rw-r--r-- | vp9/common/arm/vp9_bilinearfilter_arm.h (renamed from vp9/common/arm/bilinearfilter_arm.h) | 0 | ||||
-rw-r--r-- | vp9/common/arm/vp9_filter_arm.c (renamed from vp9/common/arm/filter_arm.c) | 4 | ||||
-rw-r--r-- | vp9/common/arm/vp9_idct_arm.h (renamed from vp9/common/arm/idct_arm.h) | 0 | ||||
-rw-r--r-- | vp9/common/arm/vp9_loopfilter_arm.c (renamed from vp9/common/arm/loopfilter_arm.c) | 4 | ||||
-rw-r--r-- | vp9/common/arm/vp9_loopfilter_arm.h (renamed from vp9/common/arm/loopfilter_arm.h) | 0 | ||||
-rw-r--r-- | vp9/common/arm/vp9_recon_arm.h (renamed from vp9/common/arm/recon_arm.h) | 0 | ||||
-rw-r--r-- | vp9/common/arm/vp9_reconintra_arm.c (renamed from vp9/common/arm/reconintra_arm.c) | 4 | ||||
-rw-r--r-- | vp9/common/arm/vp9_subpixel_arm.h (renamed from vp9/common/arm/subpixel_arm.h) | 0 | ||||
-rw-r--r-- | vp9/common/generic/vp9_systemdependent.c (renamed from vp9/common/generic/systemdependent.c) | 6 | ||||
-rw-r--r-- | vp9/common/ppc/vp9_copy_altivec.asm (renamed from vp9/common/ppc/copy_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/common/ppc/vp9_filter_altivec.asm (renamed from vp9/common/ppc/filter_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/common/ppc/vp9_filter_bilinear_altivec.asm (renamed from vp9/common/ppc/filter_bilinear_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/common/ppc/vp9_idctllm_altivec.asm (renamed from vp9/common/ppc/idctllm_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/common/ppc/vp9_loopfilter_altivec.c (renamed from vp9/common/ppc/loopfilter_altivec.c) | 4 | ||||
-rw-r--r-- | vp9/common/ppc/vp9_loopfilter_filters_altivec.asm (renamed from vp9/common/ppc/loopfilter_filters_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/common/ppc/vp9_platform_altivec.asm (renamed from vp9/common/ppc/platform_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/common/ppc/vp9_recon_altivec.asm (renamed from vp9/common/ppc/recon_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/common/ppc/vp9_systemdependent.c (renamed from vp9/common/ppc/systemdependent.c) | 6 | ||||
-rw-r--r-- | vp9/common/vp9_alloccommon.c (renamed from vp9/common/alloccommon.c) | 12 | ||||
-rw-r--r-- | vp9/common/vp9_alloccommon.h (renamed from vp9/common/alloccommon.h) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_asm_com_offsets.c (renamed from vp9/common/asm_com_offsets.c) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_blockd.c (renamed from vp9/common/blockd.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_blockd.h (renamed from vp9/common/blockd.h) | 8 | ||||
-rw-r--r-- | vp9/common/vp9_coefupdateprobs.h (renamed from vp9/common/coefupdateprobs.h) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_common.h (renamed from vp9/common/common.h) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_common_types.h (renamed from vp9/common/common_types.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_context.c (renamed from vp9/common/context.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_debugmodes.c (renamed from vp9/common/debugmodes.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_default_coef_probs.h (renamed from vp9/common/default_coef_probs.h) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_entropy.c (renamed from vp9/common/entropy.c) | 12 | ||||
-rw-r--r-- | vp9/common/vp9_entropy.h (renamed from vp9/common/entropy.h) | 8 | ||||
-rw-r--r-- | vp9/common/vp9_entropymode.c (renamed from vp9/common/entropymode.c) | 6 | ||||
-rw-r--r-- | vp9/common/vp9_entropymode.h (renamed from vp9/common/entropymode.h) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_entropymv.c (renamed from vp9/common/entropymv.c) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_entropymv.h (renamed from vp9/common/entropymv.h) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_extend.c (renamed from vp9/common/extend.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_extend.h (renamed from vp9/common/extend.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_filter.c (renamed from vp9/common/filter.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_filter.h (renamed from vp9/common/filter.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_findnearmv.c (renamed from vp9/common/findnearmv.c) | 6 | ||||
-rw-r--r-- | vp9/common/vp9_findnearmv.h (renamed from vp9/common/findnearmv.h) | 8 | ||||
-rw-r--r-- | vp9/common/vp9_header.h (renamed from vp9/common/header.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_idctllm.c (renamed from vp9/common/idctllm.c) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_implicit_segmentation.c (renamed from vp9/common/implicit_segmentation.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_invtrans.c (renamed from vp9/common/invtrans.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_invtrans.h (renamed from vp9/common/invtrans.h) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_loopfilter.c (renamed from vp9/common/loopfilter.c) | 6 | ||||
-rw-r--r-- | vp9/common/vp9_loopfilter.h (renamed from vp9/common/loopfilter.h) | 6 | ||||
-rw-r--r-- | vp9/common/vp9_loopfilter_filters.c (renamed from vp9/common/loopfilter_filters.c) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_maskingmv.c (renamed from vp9/common/maskingmv.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_mbpitch.c (renamed from vp9/common/mbpitch.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_modecont.c (renamed from vp9/common/modecont.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_modecont.h (renamed from vp9/common/modecont.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_modecontext.c (renamed from vp9/common/modecontext.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_mv.h (renamed from vp9/common/mv.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_mvref_common.c (renamed from vp9/common/mvref_common.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_mvref_common.h (renamed from vp9/common/mvref_common.h) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_onyx.h (renamed from vp9/common/onyx.h) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_onyxc_int.h (renamed from vp9/common/onyxc_int.h) | 12 | ||||
-rw-r--r-- | vp9/common/vp9_onyxd.h (renamed from vp9/common/onyxd.h) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_postproc.c (renamed from vp9/common/postproc.c) | 6 | ||||
-rw-r--r-- | vp9/common/vp9_postproc.h (renamed from vp9/common/postproc.h) | 6 | ||||
-rw-r--r-- | vp9/common/vp9_ppflags.h (renamed from vp9/common/ppflags.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_pragmas.h (renamed from vp9/common/pragmas.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_pred_common.c (renamed from vp9/common/pred_common.c) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_pred_common.h (renamed from vp9/common/pred_common.h) | 6 | ||||
-rw-r--r-- | vp9/common/vp9_quant_common.c (renamed from vp9/common/quant_common.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_quant_common.h (renamed from vp9/common/quant_common.h) | 4 | ||||
-rw-r--r-- | vp9/common/vp9_recon.c (renamed from vp9/common/recon.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_reconinter.c (renamed from vp9/common/reconinter.c) | 10 | ||||
-rw-r--r-- | vp9/common/vp9_reconinter.h (renamed from vp9/common/reconinter.h) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_reconintra.c (renamed from vp9/common/reconintra.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_reconintra.h (renamed from vp9/common/reconintra.h) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_reconintra4x4.c (renamed from vp9/common/reconintra4x4.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_reconintra4x4.h (renamed from vp9/common/reconintra4x4.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_rtcd.c (renamed from vp9/common/rtcd.c) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_rtcd_defs.sh (renamed from vp9/common/rtcd_defs.sh) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_sadmxn.h (renamed from vp9/common/sadmxn.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_seg_common.c (renamed from vp9/common/seg_common.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_seg_common.h (renamed from vp9/common/seg_common.h) | 6 | ||||
-rw-r--r-- | vp9/common/vp9_setupintrarecon.c (renamed from vp9/common/setupintrarecon.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_setupintrarecon.h (renamed from vp9/common/setupintrarecon.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_subpelvar.h (renamed from vp9/common/subpelvar.h) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_subpixel.h (renamed from vp9/common/subpixel.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_swapyv12buffer.c (renamed from vp9/common/swapyv12buffer.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_swapyv12buffer.h (renamed from vp9/common/swapyv12buffer.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_systemdependent.h (renamed from vp9/common/systemdependent.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_tapify.py (renamed from vp9/common/tapify.py) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_textblit.c (renamed from vp9/common/textblit.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_textblit.h (renamed from vp9/common/textblit.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_treecoder.c (renamed from vp9/common/treecoder.c) | 2 | ||||
-rw-r--r-- | vp9/common/vp9_treecoder.h (renamed from vp9/common/treecoder.h) | 0 | ||||
-rw-r--r-- | vp9/common/vp9_type_aliases.h (renamed from vp9/common/type_aliases.h) | 2 | ||||
-rw-r--r-- | vp9/common/x86/vp9_filter_sse2.c (renamed from vp9/common/x86/filter_sse2.c) | 2 | ||||
-rw-r--r-- | vp9/common/x86/vp9_filter_sse4.c (renamed from vp9/common/x86/filter_sse4.c) | 2 | ||||
-rw-r--r-- | vp9/common/x86/vp9_idct_x86.h (renamed from vp9/common/x86/idct_x86.h) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_idctllm_mmx.asm (renamed from vp9/common/x86/idctllm_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_idctllm_sse2.asm (renamed from vp9/common/x86/idctllm_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_iwalsh_mmx.asm (renamed from vp9/common/x86/iwalsh_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_iwalsh_sse2.asm (renamed from vp9/common/x86/iwalsh_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_loopfilter_mmx.asm (renamed from vp9/common/x86/loopfilter_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_loopfilter_sse2.asm (renamed from vp9/common/x86/loopfilter_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_loopfilter_x86.c (renamed from vp9/common/x86/loopfilter_x86.c) | 2 | ||||
-rw-r--r-- | vp9/common/x86/vp9_loopfilter_x86.h (renamed from vp9/common/x86/loopfilter_x86.h) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_mask_sse3.asm (renamed from vp9/common/x86/mask_sse3.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_postproc_mmx.asm (renamed from vp9/common/x86/postproc_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_postproc_sse2.asm (renamed from vp9/common/x86/postproc_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_postproc_x86.h (renamed from vp9/common/x86/postproc_x86.h) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_recon_mmx.asm (renamed from vp9/common/x86/recon_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_recon_sse2.asm (renamed from vp9/common/x86/recon_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_recon_wrapper_sse2.c (renamed from vp9/common/x86/recon_wrapper_sse2.c) | 2 | ||||
-rw-r--r-- | vp9/common/x86/vp9_sadmxn_x86.c (renamed from vp9/common/x86/sadmxn_x86.c) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_subpixel_8t_ssse3.asm (renamed from vp9/common/x86/subpixel_8t_ssse3.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_subpixel_mmx.asm (renamed from vp9/common/x86/subpixel_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_subpixel_sse2.asm (renamed from vp9/common/x86/subpixel_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_subpixel_ssse3.asm (renamed from vp9/common/x86/subpixel_ssse3.asm) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_subpixel_x86.h (renamed from vp9/common/x86/subpixel_x86.h) | 0 | ||||
-rw-r--r-- | vp9/common/x86/vp9_vp8_asm_stubs.c (renamed from vp9/common/x86/vp8_asm_stubs.c) | 2 | ||||
-rw-r--r-- | vp9/common/x86/vp9_x86_systemdependent.c (renamed from vp9/common/x86/x86_systemdependent.c) | 6 | ||||
-rw-r--r-- | vp9/decoder/arm/armv6/vp9_dequant_dc_idct_v6.asm (renamed from vp9/decoder/arm/armv6/dequant_dc_idct_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/arm/armv6/vp9_dequant_idct_v6.asm (renamed from vp9/decoder/arm/armv6/dequant_idct_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/arm/armv6/vp9_dequantize_v6.asm (renamed from vp9/decoder/arm/armv6/dequantize_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/arm/armv6/vp9_idct_blk_v6.c (renamed from vp9/decoder/arm/armv6/idct_blk_v6.c) | 4 | ||||
-rw-r--r-- | vp9/decoder/arm/neon/vp9_dequant_idct_neon.asm (renamed from vp9/decoder/arm/neon/dequant_idct_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/arm/neon/vp9_dequantizeb_neon.asm (renamed from vp9/decoder/arm/neon/dequantizeb_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/arm/neon/vp9_idct_blk_neon.c (renamed from vp9/decoder/arm/neon/idct_blk_neon.c) | 4 | ||||
-rw-r--r-- | vp9/decoder/arm/neon/vp9_idct_dequant_0_2x_neon.asm (renamed from vp9/decoder/arm/neon/idct_dequant_0_2x_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/arm/neon/vp9_idct_dequant_dc_0_2x_neon.asm (renamed from vp9/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/arm/neon/vp9_idct_dequant_dc_full_2x_neon.asm (renamed from vp9/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/arm/neon/vp9_idct_dequant_full_2x_neon.asm (renamed from vp9/decoder/arm/neon/idct_dequant_full_2x_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/arm/vp9_dequantize_arm.c (renamed from vp9/decoder/arm/dequantize_arm.c) | 4 | ||||
-rw-r--r-- | vp9/decoder/vp9_asm_dec_offsets.c (renamed from vp9/decoder/asm_dec_offsets.c) | 2 | ||||
-rw-r--r-- | vp9/decoder/vp9_dboolhuff.c (renamed from vp9/decoder/dboolhuff.c) | 2 | ||||
-rw-r--r-- | vp9/decoder/vp9_dboolhuff.h (renamed from vp9/decoder/dboolhuff.h) | 0 | ||||
-rw-r--r-- | vp9/decoder/vp9_decodemv.c (renamed from vp9/decoder/decodemv.c) | 22 | ||||
-rw-r--r-- | vp9/decoder/vp9_decodemv.h (renamed from vp9/decoder/decodemv.h) | 2 | ||||
-rw-r--r-- | vp9/decoder/vp9_decodframe.c (renamed from vp9/decoder/decodframe.c) | 36 | ||||
-rw-r--r-- | vp9/decoder/vp9_decodframe.h (renamed from vp9/decoder/decodframe.h) | 0 | ||||
-rw-r--r-- | vp9/decoder/vp9_dequantize.c (renamed from vp9/decoder/dequantize.c) | 4 | ||||
-rw-r--r-- | vp9/decoder/vp9_dequantize.h (renamed from vp9/decoder/dequantize.h) | 2 | ||||
-rw-r--r-- | vp9/decoder/vp9_detokenize.c (renamed from vp9/decoder/detokenize.c) | 10 | ||||
-rw-r--r-- | vp9/decoder/vp9_detokenize.h (renamed from vp9/decoder/detokenize.h) | 2 | ||||
-rw-r--r-- | vp9/decoder/vp9_idct_blk.c (renamed from vp9/decoder/idct_blk.c) | 2 | ||||
-rw-r--r-- | vp9/decoder/vp9_onyxd_if.c (renamed from vp9/decoder/onyxd_if.c) | 22 | ||||
-rw-r--r-- | vp9/decoder/vp9_onyxd_int.h (renamed from vp9/decoder/onyxd_int.h) | 8 | ||||
-rw-r--r-- | vp9/decoder/vp9_reconintra_mt.h (renamed from vp9/decoder/reconintra_mt.h) | 0 | ||||
-rw-r--r-- | vp9/decoder/vp9_treereader.h (renamed from vp9/decoder/treereader.h) | 4 | ||||
-rw-r--r-- | vp9/decoder/x86/vp9_dequantize_mmx.asm (renamed from vp9/decoder/x86/dequantize_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/decoder/x86/vp9_idct_blk_mmx.c (renamed from vp9/decoder/x86/idct_blk_mmx.c) | 4 | ||||
-rw-r--r-- | vp9/decoder/x86/vp9_idct_blk_sse2.c (renamed from vp9/decoder/x86/idct_blk_sse2.c) | 4 | ||||
-rw-r--r-- | vp9/decoder/x86/vp9_x86_dsystemdependent.c (renamed from vp9/decoder/x86/x86_dsystemdependent.c) | 2 | ||||
-rw-r--r-- | vp9/encoder/arm/armv5te/vp9_boolhuff_armv5te.asm (renamed from vp9/encoder/arm/armv5te/boolhuff_armv5te.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv5te/vp9_vp8_packtokens_armv5.asm (renamed from vp9/encoder/arm/armv5te/vp8_packtokens_armv5.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv5te/vp9_vp8_packtokens_mbrow_armv5.asm (renamed from vp9/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv5te/vp9_vp8_packtokens_partitions_armv5.asm (renamed from vp9/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_fast_quantize_b_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_mse16x16_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_mse16x16_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_sad16x16_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_sad16x16_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_short_fdct4x4_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_subtract_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_subtract_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_variance16x16_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_variance16x16_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_variance8x8_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_variance8x8_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_h_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_hv_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_v_armv6.asm (renamed from vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/armv6/vp9_walsh_v6.asm (renamed from vp9/encoder/arm/armv6/walsh_v6.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_fastquantizeb_neon.asm (renamed from vp9/encoder/arm/neon/fastquantizeb_neon.asm) | 2 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_picklpf_arm.c (renamed from vp9/encoder/arm/neon/picklpf_arm.c) | 8 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_sad16_neon.asm (renamed from vp9/encoder/arm/neon/sad16_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_sad8_neon.asm (renamed from vp9/encoder/arm/neon/sad8_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_shortfdct_neon.asm (renamed from vp9/encoder/arm/neon/shortfdct_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_subtract_neon.asm (renamed from vp9/encoder/arm/neon/subtract_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_variance_neon.asm (renamed from vp9/encoder/arm/neon/variance_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_vp8_memcpy_neon.asm (renamed from vp9/encoder/arm/neon/vp8_memcpy_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_vp8_mse16x16_neon.asm (renamed from vp9/encoder/arm/neon/vp8_mse16x16_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_vp8_shortwalsh4x4_neon.asm (renamed from vp9/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16_neon.asm (renamed from vp9/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16s_neon.asm (renamed from vp9/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/neon/vp9_vp8_subpixelvariance8x8_neon.asm (renamed from vp9/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/vp9_arm_csystemdependent.c (renamed from vp9/encoder/arm/arm_csystemdependent.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/arm/vp9_boolhuff_arm.c (renamed from vp9/encoder/arm/boolhuff_arm.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/arm/vp9_dct_arm.c (renamed from vp9/encoder/arm/dct_arm.c) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/vp9_dct_arm.h (renamed from vp9/encoder/arm/dct_arm.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/vp9_encodemb_arm.h (renamed from vp9/encoder/arm/encodemb_arm.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/vp9_quantize_arm.c (renamed from vp9/encoder/arm/quantize_arm.c) | 6 | ||||
-rw-r--r-- | vp9/encoder/arm/vp9_quantize_arm.h (renamed from vp9/encoder/arm/quantize_arm.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/arm/vp9_variance_arm.c (renamed from vp9/encoder/arm/variance_arm.c) | 6 | ||||
-rw-r--r-- | vp9/encoder/arm/vp9_variance_arm.h (renamed from vp9/encoder/arm/variance_arm.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/generic/vp9_csystemdependent.c (renamed from vp9/encoder/generic/csystemdependent.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/ppc/vp9_csystemdependent.c (renamed from vp9/encoder/ppc/csystemdependent.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/ppc/vp9_encodemb_altivec.asm (renamed from vp9/encoder/ppc/encodemb_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/ppc/vp9_fdct_altivec.asm (renamed from vp9/encoder/ppc/fdct_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/ppc/vp9_rdopt_altivec.asm (renamed from vp9/encoder/ppc/rdopt_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/ppc/vp9_sad_altivec.asm (renamed from vp9/encoder/ppc/sad_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/ppc/vp9_variance_altivec.asm (renamed from vp9/encoder/ppc/variance_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/ppc/vp9_variance_subpixel_altivec.asm (renamed from vp9/encoder/ppc/variance_subpixel_altivec.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_asm_enc_offsets.c (renamed from vp9/encoder/asm_enc_offsets.c) | 10 | ||||
-rw-r--r-- | vp9/encoder/vp9_bitstream.c (renamed from vp9/encoder/bitstream.c) | 32 | ||||
-rw-r--r-- | vp9/encoder/vp9_bitstream.h (renamed from vp9/encoder/bitstream.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_block.h (renamed from vp9/encoder/block.h) | 8 | ||||
-rw-r--r-- | vp9/encoder/vp9_boolhuff.c (renamed from vp9/encoder/boolhuff.c) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_boolhuff.h (renamed from vp9/encoder/boolhuff.h) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_dct.c (renamed from vp9/encoder/dct.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c (renamed from vp9/encoder/encodeframe.c) | 42 | ||||
-rw-r--r-- | vp9/encoder/vp9_encodeframe.h (renamed from vp9/encoder/encodeframe.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_encodeintra.c (renamed from vp9/encoder/encodeintra.c) | 12 | ||||
-rw-r--r-- | vp9/encoder/vp9_encodeintra.h (renamed from vp9/encoder/encodeintra.h) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_encodemb.c (renamed from vp9/encoder/encodemb.c) | 16 | ||||
-rw-r--r-- | vp9/encoder/vp9_encodemb.h (renamed from vp9/encoder/encodemb.h) | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_encodemv.c (renamed from vp9/encoder/encodemv.c) | 8 | ||||
-rw-r--r-- | vp9/encoder/vp9_encodemv.h (renamed from vp9/encoder/encodemv.h) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_firstpass.c (renamed from vp9/encoder/firstpass.c) | 36 | ||||
-rw-r--r-- | vp9/encoder/vp9_firstpass.h (renamed from vp9/encoder/firstpass.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_lookahead.c (renamed from vp9/encoder/lookahead.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_lookahead.h (renamed from vp9/encoder/lookahead.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_mbgraph.c (renamed from vp9/encoder/mbgraph.c) | 14 | ||||
-rw-r--r-- | vp9/encoder/vp9_mbgraph.h (renamed from vp9/encoder/mbgraph.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_mcomp.c (renamed from vp9/encoder/mcomp.c) | 10 | ||||
-rw-r--r-- | vp9/encoder/vp9_mcomp.h (renamed from vp9/encoder/mcomp.h) | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_modecosts.c (renamed from vp9/encoder/modecosts.c) | 8 | ||||
-rw-r--r-- | vp9/encoder/vp9_modecosts.h (renamed from vp9/encoder/modecosts.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_onyx_if.c (renamed from vp9/encoder/onyx_if.c) | 50 | ||||
-rw-r--r-- | vp9/encoder/vp9_onyx_int.h (renamed from vp9/encoder/onyx_int.h) | 26 | ||||
-rw-r--r-- | vp9/encoder/vp9_picklpf.c (renamed from vp9/encoder/picklpf.c) | 12 | ||||
-rw-r--r-- | vp9/encoder/vp9_picklpf.h (renamed from vp9/encoder/picklpf.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_psnr.c (renamed from vp9/encoder/psnr.c) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_psnr.h (renamed from vp9/encoder/psnr.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_quantize.c (renamed from vp9/encoder/quantize.c) | 8 | ||||
-rw-r--r-- | vp9/encoder/vp9_quantize.h (renamed from vp9/encoder/quantize.h) | 6 | ||||
-rw-r--r-- | vp9/encoder/vp9_ratectrl.c (renamed from vp9/encoder/ratectrl.c) | 14 | ||||
-rw-r--r-- | vp9/encoder/vp9_ratectrl.h (renamed from vp9/encoder/ratectrl.h) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_rdopt.c (renamed from vp9/encoder/rdopt.c) | 50 | ||||
-rw-r--r-- | vp9/encoder/vp9_rdopt.h (renamed from vp9/encoder/rdopt.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_sad_c.c (renamed from vp9/encoder/sad_c.c) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_satd_c.c (renamed from vp9/encoder/satd_c.c) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_segmentation.c (renamed from vp9/encoder/segmentation.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_segmentation.h (renamed from vp9/encoder/segmentation.h) | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_ssim.c (renamed from vp9/encoder/ssim.c) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_temporal_filter.c (renamed from vp9/encoder/temporal_filter.c) | 26 | ||||
-rw-r--r-- | vp9/encoder/vp9_temporal_filter.h (renamed from vp9/encoder/temporal_filter.h) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_tokenize.c (renamed from vp9/encoder/tokenize.c) | 16 | ||||
-rw-r--r-- | vp9/encoder/vp9_tokenize.h (renamed from vp9/encoder/tokenize.h) | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_treewriter.c (renamed from vp9/encoder/treewriter.c) | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_treewriter.h (renamed from vp9/encoder/treewriter.h) | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_variance.h (renamed from vp9/encoder/variance.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/vp9_variance_c.c (renamed from vp9/encoder/variance_c.c) | 6 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_dct_mmx.asm (renamed from vp9/encoder/x86/dct_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_dct_sse2.asm (renamed from vp9/encoder/x86/dct_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_encodeopt.asm (renamed from vp9/encoder/x86/encodeopt.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_fwalsh_sse2.asm (renamed from vp9/encoder/x86/fwalsh_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_mcomp_x86.h (renamed from vp9/encoder/x86/mcomp_x86.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_quantize_mmx.asm (renamed from vp9/encoder/x86/quantize_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_quantize_sse2.asm (renamed from vp9/encoder/x86/quantize_sse2.asm) | 2 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_quantize_sse4.asm (renamed from vp9/encoder/x86/quantize_sse4.asm) | 4 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_quantize_ssse3.asm (renamed from vp9/encoder/x86/quantize_ssse3.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_quantize_x86.h (renamed from vp9/encoder/x86/quantize_x86.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_sad_mmx.asm (renamed from vp9/encoder/x86/sad_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_sad_sse2.asm (renamed from vp9/encoder/x86/sad_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_sad_sse3.asm (renamed from vp9/encoder/x86/sad_sse3.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_sad_sse4.asm (renamed from vp9/encoder/x86/sad_sse4.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_sad_ssse3.asm (renamed from vp9/encoder/x86/sad_ssse3.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_ssim_opt.asm (renamed from vp9/encoder/x86/ssim_opt.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_subtract_mmx.asm (renamed from vp9/encoder/x86/subtract_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_subtract_sse2.asm (renamed from vp9/encoder/x86/subtract_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm (renamed from vp9/encoder/x86/temporal_filter_apply_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_temporal_filter_x86.h (renamed from vp9/encoder/x86/temporal_filter_x86.h) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_variance_impl_mmx.asm (renamed from vp9/encoder/x86/variance_impl_mmx.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_variance_impl_sse2.asm (renamed from vp9/encoder/x86/variance_impl_sse2.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_variance_impl_ssse3.asm (renamed from vp9/encoder/x86/variance_impl_ssse3.asm) | 0 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_variance_mmx.c (renamed from vp9/encoder/x86/variance_mmx.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_variance_sse2.c (renamed from vp9/encoder/x86/variance_sse2.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_variance_ssse3.c (renamed from vp9/encoder/x86/variance_ssse3.c) | 4 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_x86_csystemdependent.c (renamed from vp9/encoder/x86/x86_csystemdependent.c) | 4 | ||||
-rw-r--r-- | vp9/vp9_common.mk | 230 | ||||
-rw-r--r-- | vp9/vp9_cx_iface.c | 6 | ||||
-rw-r--r-- | vp9/vp9_dx_iface.c | 4 | ||||
-rw-r--r-- | vp9/vp9cx.mk | 158 | ||||
-rw-r--r-- | vp9/vp9cx_arm.mk | 22 | ||||
-rw-r--r-- | vp9/vp9dx.mk | 38 | ||||
-rw-r--r-- | vp9/vp9dx_arm.mk | 6 |
322 files changed, 705 insertions, 705 deletions
diff --git a/test/variance_test.cc b/test/variance_test.cc index 2012b186e..83f113994 100644 --- a/test/variance_test.cc +++ b/test/variance_test.cc @@ -14,7 +14,7 @@ #include "vpx_config.h" extern "C" { -#include "vp9/encoder/variance.h" +#include "vp9/encoder/vp9_variance.h" #include "vpx/vpx_integer.h" #include "vp9_rtcd.h" } diff --git a/test/vp9_boolcoder_test.cc b/test/vp9_boolcoder_test.cc index 68a69d510..bde28a5f3 100644 --- a/test/vp9_boolcoder_test.cc +++ b/test/vp9_boolcoder_test.cc @@ -15,8 +15,8 @@ #include "third_party/googletest/src/include/gtest/gtest.h" extern "C" { -#include "vp9/encoder/boolhuff.h" -#include "vp9/decoder/dboolhuff.h" +#include "vp9/encoder/vp9_boolhuff.h" +#include "vp9/decoder/vp9_dboolhuff.h" } #include "acm_random.h" diff --git a/vp9/common/arm/armv6/bilinearfilter_v6.asm b/vp9/common/arm/armv6/vp9_bilinearfilter_v6.asm index 36e391e2b..36e391e2b 100644 --- a/vp9/common/arm/armv6/bilinearfilter_v6.asm +++ b/vp9/common/arm/armv6/vp9_bilinearfilter_v6.asm diff --git a/vp9/common/arm/armv6/copymem16x16_v6.asm b/vp9/common/arm/armv6/vp9_copymem16x16_v6.asm index 44c3c492f..44c3c492f 100644 --- a/vp9/common/arm/armv6/copymem16x16_v6.asm +++ b/vp9/common/arm/armv6/vp9_copymem16x16_v6.asm diff --git a/vp9/common/arm/armv6/copymem8x4_v6.asm b/vp9/common/arm/armv6/vp9_copymem8x4_v6.asm index 45b904367..45b904367 100644 --- a/vp9/common/arm/armv6/copymem8x4_v6.asm +++ b/vp9/common/arm/armv6/vp9_copymem8x4_v6.asm diff --git a/vp9/common/arm/armv6/copymem8x8_v6.asm b/vp9/common/arm/armv6/vp9_copymem8x8_v6.asm index 0dd971bfe..0dd971bfe 100644 --- a/vp9/common/arm/armv6/copymem8x8_v6.asm +++ b/vp9/common/arm/armv6/vp9_copymem8x8_v6.asm diff --git a/vp9/common/arm/armv6/dc_only_idct_add_v6.asm b/vp9/common/arm/armv6/vp9_dc_only_idct_add_v6.asm index e0660e9fd..e0660e9fd 100644 --- a/vp9/common/arm/armv6/dc_only_idct_add_v6.asm +++ b/vp9/common/arm/armv6/vp9_dc_only_idct_add_v6.asm diff --git a/vp9/common/arm/armv6/filter_v6.asm b/vp9/common/arm/armv6/vp9_filter_v6.asm index 16b321e37..16b321e37 100644 --- a/vp9/common/arm/armv6/filter_v6.asm +++ b/vp9/common/arm/armv6/vp9_filter_v6.asm diff --git a/vp9/common/arm/armv6/idct_v6.asm b/vp9/common/arm/armv6/vp9_idct_v6.asm index 27215afcd..27215afcd 100644 --- a/vp9/common/arm/armv6/idct_v6.asm +++ b/vp9/common/arm/armv6/vp9_idct_v6.asm diff --git a/vp9/common/arm/armv6/iwalsh_v6.asm b/vp9/common/arm/armv6/vp9_iwalsh_v6.asm index 463bff0f5..463bff0f5 100644 --- a/vp9/common/arm/armv6/iwalsh_v6.asm +++ b/vp9/common/arm/armv6/vp9_iwalsh_v6.asm diff --git a/vp9/common/arm/armv6/loopfilter_v6.asm b/vp9/common/arm/armv6/vp9_loopfilter_v6.asm index 37b54a39c..37b54a39c 100644 --- a/vp9/common/arm/armv6/loopfilter_v6.asm +++ b/vp9/common/arm/armv6/vp9_loopfilter_v6.asm diff --git a/vp9/common/arm/armv6/recon_v6.asm b/vp9/common/arm/armv6/vp9_recon_v6.asm index 99c7bcf2d..99c7bcf2d 100644 --- a/vp9/common/arm/armv6/recon_v6.asm +++ b/vp9/common/arm/armv6/vp9_recon_v6.asm diff --git a/vp9/common/arm/armv6/simpleloopfilter_v6.asm b/vp9/common/arm/armv6/vp9_simpleloopfilter_v6.asm index 8306912be..8306912be 100644 --- a/vp9/common/arm/armv6/simpleloopfilter_v6.asm +++ b/vp9/common/arm/armv6/vp9_simpleloopfilter_v6.asm diff --git a/vp9/common/arm/armv6/sixtappredict8x4_v6.asm b/vp9/common/arm/armv6/vp9_sixtappredict8x4_v6.asm index 5bf94e090..5bf94e090 100644 --- a/vp9/common/arm/armv6/sixtappredict8x4_v6.asm +++ b/vp9/common/arm/armv6/vp9_sixtappredict8x4_v6.asm diff --git a/vp9/common/arm/neon/bilinearpredict16x16_neon.asm b/vp9/common/arm/neon/vp9_bilinearpredict16x16_neon.asm index 2528be7c3..2528be7c3 100644 --- a/vp9/common/arm/neon/bilinearpredict16x16_neon.asm +++ b/vp9/common/arm/neon/vp9_bilinearpredict16x16_neon.asm diff --git a/vp9/common/arm/neon/bilinearpredict4x4_neon.asm b/vp9/common/arm/neon/vp9_bilinearpredict4x4_neon.asm index 01eedf8e9..01eedf8e9 100644 --- a/vp9/common/arm/neon/bilinearpredict4x4_neon.asm +++ b/vp9/common/arm/neon/vp9_bilinearpredict4x4_neon.asm diff --git a/vp9/common/arm/neon/bilinearpredict8x4_neon.asm b/vp9/common/arm/neon/vp9_bilinearpredict8x4_neon.asm index 8f49345ff..8f49345ff 100644 --- a/vp9/common/arm/neon/bilinearpredict8x4_neon.asm +++ b/vp9/common/arm/neon/vp9_bilinearpredict8x4_neon.asm diff --git a/vp9/common/arm/neon/bilinearpredict8x8_neon.asm b/vp9/common/arm/neon/vp9_bilinearpredict8x8_neon.asm index 6967f1950..6967f1950 100644 --- a/vp9/common/arm/neon/bilinearpredict8x8_neon.asm +++ b/vp9/common/arm/neon/vp9_bilinearpredict8x8_neon.asm diff --git a/vp9/common/arm/neon/buildintrapredictorsmby_neon.asm b/vp9/common/arm/neon/vp9_buildintrapredictorsmby_neon.asm index e3ea91fe6..e3ea91fe6 100644 --- a/vp9/common/arm/neon/buildintrapredictorsmby_neon.asm +++ b/vp9/common/arm/neon/vp9_buildintrapredictorsmby_neon.asm diff --git a/vp9/common/arm/neon/copymem16x16_neon.asm b/vp9/common/arm/neon/vp9_copymem16x16_neon.asm index bff8156d9..bff8156d9 100644 --- a/vp9/common/arm/neon/copymem16x16_neon.asm +++ b/vp9/common/arm/neon/vp9_copymem16x16_neon.asm diff --git a/vp9/common/arm/neon/copymem8x4_neon.asm b/vp9/common/arm/neon/vp9_copymem8x4_neon.asm index ffd2df8e1..ffd2df8e1 100644 --- a/vp9/common/arm/neon/copymem8x4_neon.asm +++ b/vp9/common/arm/neon/vp9_copymem8x4_neon.asm diff --git a/vp9/common/arm/neon/copymem8x8_neon.asm b/vp9/common/arm/neon/vp9_copymem8x8_neon.asm index 2d394c043..2d394c043 100644 --- a/vp9/common/arm/neon/copymem8x8_neon.asm +++ b/vp9/common/arm/neon/vp9_copymem8x8_neon.asm diff --git a/vp9/common/arm/neon/dc_only_idct_add_neon.asm b/vp9/common/arm/neon/vp9_dc_only_idct_add_neon.asm index 49ba05fb0..49ba05fb0 100644 --- a/vp9/common/arm/neon/dc_only_idct_add_neon.asm +++ b/vp9/common/arm/neon/vp9_dc_only_idct_add_neon.asm diff --git a/vp9/common/arm/neon/iwalsh_neon.asm b/vp9/common/arm/neon/vp9_iwalsh_neon.asm index 01c79d937..01c79d937 100644 --- a/vp9/common/arm/neon/iwalsh_neon.asm +++ b/vp9/common/arm/neon/vp9_iwalsh_neon.asm diff --git a/vp9/common/arm/neon/loopfilter_neon.asm b/vp9/common/arm/neon/vp9_loopfilter_neon.asm index bc6616734..bc6616734 100644 --- a/vp9/common/arm/neon/loopfilter_neon.asm +++ b/vp9/common/arm/neon/vp9_loopfilter_neon.asm diff --git a/vp9/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm b/vp9/common/arm/neon/vp9_loopfiltersimplehorizontaledge_neon.asm index eb07ce0d5..eb07ce0d5 100644 --- a/vp9/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm +++ b/vp9/common/arm/neon/vp9_loopfiltersimplehorizontaledge_neon.asm diff --git a/vp9/common/arm/neon/loopfiltersimpleverticaledge_neon.asm b/vp9/common/arm/neon/vp9_loopfiltersimpleverticaledge_neon.asm index d5cf8c2b5..d5cf8c2b5 100644 --- a/vp9/common/arm/neon/loopfiltersimpleverticaledge_neon.asm +++ b/vp9/common/arm/neon/vp9_loopfiltersimpleverticaledge_neon.asm diff --git a/vp9/common/arm/neon/mbloopfilter_neon.asm b/vp9/common/arm/neon/vp9_mbloopfilter_neon.asm index 19b67f47d..19b67f47d 100644 --- a/vp9/common/arm/neon/mbloopfilter_neon.asm +++ b/vp9/common/arm/neon/vp9_mbloopfilter_neon.asm diff --git a/vp9/common/arm/neon/recon16x16mb_neon.asm b/vp9/common/arm/neon/vp9_recon16x16mb_neon.asm index 3f1a30f48..3f1a30f48 100644 --- a/vp9/common/arm/neon/recon16x16mb_neon.asm +++ b/vp9/common/arm/neon/vp9_recon16x16mb_neon.asm diff --git a/vp9/common/arm/neon/recon2b_neon.asm b/vp9/common/arm/neon/vp9_recon2b_neon.asm index 99b251c91..99b251c91 100644 --- a/vp9/common/arm/neon/recon2b_neon.asm +++ b/vp9/common/arm/neon/vp9_recon2b_neon.asm diff --git a/vp9/common/arm/neon/recon4b_neon.asm b/vp9/common/arm/neon/vp9_recon4b_neon.asm index 991727746..991727746 100644 --- a/vp9/common/arm/neon/recon4b_neon.asm +++ b/vp9/common/arm/neon/vp9_recon4b_neon.asm diff --git a/vp9/common/arm/neon/recon_neon.c b/vp9/common/arm/neon/vp9_recon_neon.c index 10fd46feb..cc3f9f59d 100644 --- a/vp9/common/arm/neon/recon_neon.c +++ b/vp9/common/arm/neon/vp9_recon_neon.c @@ -11,7 +11,7 @@ #include "vpx_ports/config.h" #include "vp9/common/recon.h" -#include "vp9/common/blockd.h" +#include "vp9/common/vp9_blockd.h" extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr); diff --git a/vp9/common/arm/neon/reconb_neon.asm b/vp9/common/arm/neon/vp9_reconb_neon.asm index 288c0ef01..288c0ef01 100644 --- a/vp9/common/arm/neon/reconb_neon.asm +++ b/vp9/common/arm/neon/vp9_reconb_neon.asm diff --git a/vp9/common/arm/neon/save_neon_reg.asm b/vp9/common/arm/neon/vp9_save_neon_reg.asm index 71c3e7077..71c3e7077 100644 --- a/vp9/common/arm/neon/save_neon_reg.asm +++ b/vp9/common/arm/neon/vp9_save_neon_reg.asm diff --git a/vp9/common/arm/neon/shortidct4x4llm_1_neon.asm b/vp9/common/arm/neon/vp9_shortidct4x4llm_1_neon.asm index d7bdbae75..d7bdbae75 100644 --- a/vp9/common/arm/neon/shortidct4x4llm_1_neon.asm +++ b/vp9/common/arm/neon/vp9_shortidct4x4llm_1_neon.asm diff --git a/vp9/common/arm/neon/shortidct4x4llm_neon.asm b/vp9/common/arm/neon/vp9_shortidct4x4llm_neon.asm index b74c31521..b74c31521 100644 --- a/vp9/common/arm/neon/shortidct4x4llm_neon.asm +++ b/vp9/common/arm/neon/vp9_shortidct4x4llm_neon.asm diff --git a/vp9/common/arm/neon/sixtappredict16x16_neon.asm b/vp9/common/arm/neon/vp9_sixtappredict16x16_neon.asm index 5e83f49f5..5e83f49f5 100644 --- a/vp9/common/arm/neon/sixtappredict16x16_neon.asm +++ b/vp9/common/arm/neon/vp9_sixtappredict16x16_neon.asm diff --git a/vp9/common/arm/neon/sixtappredict4x4_neon.asm b/vp9/common/arm/neon/vp9_sixtappredict4x4_neon.asm index 5966b642f..5966b642f 100644 --- a/vp9/common/arm/neon/sixtappredict4x4_neon.asm +++ b/vp9/common/arm/neon/vp9_sixtappredict4x4_neon.asm diff --git a/vp9/common/arm/neon/sixtappredict8x4_neon.asm b/vp9/common/arm/neon/vp9_sixtappredict8x4_neon.asm index 9ce1e3bbd..9ce1e3bbd 100644 --- a/vp9/common/arm/neon/sixtappredict8x4_neon.asm +++ b/vp9/common/arm/neon/vp9_sixtappredict8x4_neon.asm diff --git a/vp9/common/arm/neon/sixtappredict8x8_neon.asm b/vp9/common/arm/neon/vp9_sixtappredict8x8_neon.asm index 5ff16616d..5ff16616d 100644 --- a/vp9/common/arm/neon/sixtappredict8x8_neon.asm +++ b/vp9/common/arm/neon/vp9_sixtappredict8x8_neon.asm diff --git a/vp9/common/arm/arm_systemdependent.c b/vp9/common/arm/vp9_arm_systemdependent.c index 0a0e8098e..a6319a4c5 100644 --- a/vp9/common/arm/arm_systemdependent.c +++ b/vp9/common/arm/vp9_arm_systemdependent.c @@ -11,11 +11,11 @@ #include "vpx_ports/config.h" #include "vpx_ports/arm.h" -#include "vp9/common/pragmas.h" -#include "vp9/common/subpixel.h" -#include "vp9/common/loopfilter.h" +#include "vp9/common/vp9_pragmas.h" +#include "vp9/common/vp9_subpixel.h" +#include "vp9/common/vp9_loopfilter.h" #include "vp9/common/recon.h" -#include "vp9/common/onyxc_int.h" +#include "vp9/common/vp9_onyxc_int.h" void vp9_arch_arm_common_init(VP9_COMMON *ctx) { #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp9/common/arm/bilinearfilter_arm.c b/vp9/common/arm/vp9_bilinearfilter_arm.c index 287fdf04d..409e271b1 100644 --- a/vp9/common/arm/bilinearfilter_arm.c +++ b/vp9/common/arm/vp9_bilinearfilter_arm.c @@ -10,9 +10,9 @@ #include <math.h> -#include "vp9/common/filter.h" -#include "vp9/common/subpixel.h" -#include "bilinearfilter_arm.h" +#include "vp9/common/vp9_filter.h" +#include "vp9/common/vp9_subpixel.h" +#include "vp9_bilinearfilter_arm.h" void vp9_filter_block2d_bil_armv6 ( diff --git a/vp9/common/arm/bilinearfilter_arm.h b/vp9/common/arm/vp9_bilinearfilter_arm.h index b6d9cfc2d..b6d9cfc2d 100644 --- a/vp9/common/arm/bilinearfilter_arm.h +++ b/vp9/common/arm/vp9_bilinearfilter_arm.h diff --git a/vp9/common/arm/filter_arm.c b/vp9/common/arm/vp9_filter_arm.c index ccb34e236..f55273c33 100644 --- a/vp9/common/arm/filter_arm.c +++ b/vp9/common/arm/vp9_filter_arm.c @@ -11,8 +11,8 @@ #include "vpx_ports/config.h" #include <math.h> -#include "vp9/common/filter.h" -#include "vp9/common/subpixel.h" +#include "vp9/common/vp9_filter.h" +#include "vp9/common/vp9_subpixel.h" #include "vpx_ports/mem.h" extern void vp9_filter_block2d_first_pass_armv6 diff --git a/vp9/common/arm/idct_arm.h b/vp9/common/arm/vp9_idct_arm.h index 2fc4cf7fc..2fc4cf7fc 100644 --- a/vp9/common/arm/idct_arm.h +++ b/vp9/common/arm/vp9_idct_arm.h diff --git a/vp9/common/arm/loopfilter_arm.c b/vp9/common/arm/vp9_loopfilter_arm.c index abcb4c7cc..b61f1a86b 100644 --- a/vp9/common/arm/loopfilter_arm.c +++ b/vp9/common/arm/vp9_loopfilter_arm.c @@ -10,8 +10,8 @@ #include "vpx_config.h" -#include "vp9/common/loopfilter.h" -#include "vp9/common/onyxc_int.h" +#include "vp9/common/vp9_loopfilter.h" +#include "vp9/common/vp9_onyxc_int.h" #if HAVE_ARMV6 extern prototype_loopfilter(vp9_loop_filter_horizontal_edge_armv6); diff --git a/vp9/common/arm/loopfilter_arm.h b/vp9/common/arm/vp9_loopfilter_arm.h index de6b7ffbc..de6b7ffbc 100644 --- a/vp9/common/arm/loopfilter_arm.h +++ b/vp9/common/arm/vp9_loopfilter_arm.h diff --git a/vp9/common/arm/recon_arm.h b/vp9/common/arm/vp9_recon_arm.h index 1e402951c..1e402951c 100644 --- a/vp9/common/arm/recon_arm.h +++ b/vp9/common/arm/vp9_recon_arm.h diff --git a/vp9/common/arm/reconintra_arm.c b/vp9/common/arm/vp9_reconintra_arm.c index 590254680..5720828c7 100644 --- a/vp9/common/arm/reconintra_arm.c +++ b/vp9/common/arm/vp9_reconintra_arm.c @@ -10,8 +10,8 @@ #include "vpx_ports/config.h" -#include "vp9/common/blockd.h" -#include "vp9/common/reconintra.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/common/vp9_reconintra.h" #include "vpx_mem/vpx_mem.h" #include "vp9/common/recon.h" diff --git a/vp9/common/arm/subpixel_arm.h b/vp9/common/arm/vp9_subpixel_arm.h index b4f9f54f3..b4f9f54f3 100644 --- a/vp9/common/arm/subpixel_arm.h +++ b/vp9/common/arm/vp9_subpixel_arm.h diff --git a/vp9/common/generic/systemdependent.c b/vp9/common/generic/vp9_systemdependent.c index 6d1a271f5..29d1c3057 100644 --- a/vp9/common/generic/systemdependent.c +++ b/vp9/common/generic/vp9_systemdependent.c @@ -11,9 +11,9 @@ #include "vpx_ports/config.h" #include "vp9_rtcd.h" -#include "vp9/common/subpixel.h" -#include "vp9/common/loopfilter.h" -#include "vp9/common/onyxc_int.h" +#include "vp9/common/vp9_subpixel.h" +#include "vp9/common/vp9_loopfilter.h" +#include "vp9/common/vp9_onyxc_int.h" extern void vp9_arch_x86_common_init(VP9_COMMON *ctx); extern void vp9_arch_arm_common_init(VP9_COMMON *ctx); diff --git a/vp9/common/ppc/copy_altivec.asm b/vp9/common/ppc/vp9_copy_altivec.asm index a4ce91583..a4ce91583 100644 --- a/vp9/common/ppc/copy_altivec.asm +++ b/vp9/common/ppc/vp9_copy_altivec.asm diff --git a/vp9/common/ppc/filter_altivec.asm b/vp9/common/ppc/vp9_filter_altivec.asm index 4da2e94f9..4da2e94f9 100644 --- a/vp9/common/ppc/filter_altivec.asm +++ b/vp9/common/ppc/vp9_filter_altivec.asm diff --git a/vp9/common/ppc/filter_bilinear_altivec.asm b/vp9/common/ppc/vp9_filter_bilinear_altivec.asm index fd8aa665f..fd8aa665f 100644 --- a/vp9/common/ppc/filter_bilinear_altivec.asm +++ b/vp9/common/ppc/vp9_filter_bilinear_altivec.asm diff --git a/vp9/common/ppc/idctllm_altivec.asm b/vp9/common/ppc/vp9_idctllm_altivec.asm index 117d9cfc8..117d9cfc8 100644 --- a/vp9/common/ppc/idctllm_altivec.asm +++ b/vp9/common/ppc/vp9_idctllm_altivec.asm diff --git a/vp9/common/ppc/loopfilter_altivec.c b/vp9/common/ppc/vp9_loopfilter_altivec.c index 962da2319..cae171805 100644 --- a/vp9/common/ppc/loopfilter_altivec.c +++ b/vp9/common/ppc/vp9_loopfilter_altivec.c @@ -9,8 +9,8 @@ */ -#include "loopfilter.h" -#include "onyxc_int.h" +#include "vp9_loopfilter.h" +#include "vp9_onyxc_int.h" typedef void loop_filter_function_y_ppc ( diff --git a/vp9/common/ppc/loopfilter_filters_altivec.asm b/vp9/common/ppc/vp9_loopfilter_filters_altivec.asm index 61df4e976..61df4e976 100644 --- a/vp9/common/ppc/loopfilter_filters_altivec.asm +++ b/vp9/common/ppc/vp9_loopfilter_filters_altivec.asm diff --git a/vp9/common/ppc/platform_altivec.asm b/vp9/common/ppc/vp9_platform_altivec.asm index f81d86f74..f81d86f74 100644 --- a/vp9/common/ppc/platform_altivec.asm +++ b/vp9/common/ppc/vp9_platform_altivec.asm diff --git a/vp9/common/ppc/recon_altivec.asm b/vp9/common/ppc/vp9_recon_altivec.asm index dd39e05a8..dd39e05a8 100644 --- a/vp9/common/ppc/recon_altivec.asm +++ b/vp9/common/ppc/vp9_recon_altivec.asm diff --git a/vp9/common/ppc/systemdependent.c b/vp9/common/ppc/vp9_systemdependent.c index 941c11bd6..2137dee9c 100644 --- a/vp9/common/ppc/systemdependent.c +++ b/vp9/common/ppc/vp9_systemdependent.c @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "subpixel.h" -#include "loopfilter.h" +#include "vp9_subpixel.h" +#include "vp9_loopfilter.h" #include "recon.h" -#include "onyxc_int.h" +#include "vp9_onyxc_int.h" void (*vp8_short_idct4x4)(short *input, short *output, int pitch); void (*vp8_short_idct4x4_1)(short *input, short *output, int pitch); diff --git a/vp9/common/alloccommon.c b/vp9/common/vp9_alloccommon.c index 33d322099..04a8b368a 100644 --- a/vp9/common/alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -10,13 +10,13 @@ #include "vpx_ports/config.h" -#include "blockd.h" +#include "vp9_blockd.h" #include "vpx_mem/vpx_mem.h" -#include "onyxc_int.h" -#include "findnearmv.h" -#include "entropymode.h" -#include "entropymv.h" -#include "systemdependent.h" +#include "vp9_onyxc_int.h" +#include "vp9_findnearmv.h" +#include "vp9_entropymode.h" +#include "vp9_entropymv.h" +#include "vp9_systemdependent.h" void vp9_update_mode_info_border(VP9_COMMON *cpi, MODE_INFO *mi_base) { diff --git a/vp9/common/alloccommon.h b/vp9/common/vp9_alloccommon.h index 490b869b7..df94f421e 100644 --- a/vp9/common/alloccommon.h +++ b/vp9/common/vp9_alloccommon.h @@ -12,7 +12,7 @@ #ifndef __INC_ALLOCCOMMON_H #define __INC_ALLOCCOMMON_H -#include "onyxc_int.h" +#include "vp9_onyxc_int.h" void vp9_create_common(VP9_COMMON *oci); void vp9_remove_common(VP9_COMMON *oci); diff --git a/vp9/common/asm_com_offsets.c b/vp9/common/vp9_asm_com_offsets.c index 07d3e333a..07d3e333a 100644 --- a/vp9/common/asm_com_offsets.c +++ b/vp9/common/vp9_asm_com_offsets.c diff --git a/vp9/common/blockd.c b/vp9/common/vp9_blockd.c index 140500ec4..d8bb394d4 100644 --- a/vp9/common/blockd.c +++ b/vp9/common/vp9_blockd.c @@ -9,7 +9,7 @@ */ -#include "blockd.h" +#include "vp9_blockd.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp9/common/blockd.h b/vp9/common/vp9_blockd.h index 409c7b8f8..a91e8d4d0 100644 --- a/vp9/common/blockd.h +++ b/vp9/common/vp9_blockd.h @@ -16,11 +16,11 @@ void vpx_log(const char *format, ...); #include "vpx_ports/config.h" #include "vpx_scale/yv12config.h" -#include "mv.h" -#include "treecoder.h" -#include "subpixel.h" +#include "vp9_mv.h" +#include "vp9_treecoder.h" +#include "vp9_subpixel.h" #include "vpx_ports/mem.h" -#include "common.h" +#include "vp9_common.h" #define TRUE 1 #define FALSE 0 diff --git a/vp9/common/coefupdateprobs.h b/vp9/common/vp9_coefupdateprobs.h index 185bc6d84..cd7eabfa5 100644 --- a/vp9/common/coefupdateprobs.h +++ b/vp9/common/vp9_coefupdateprobs.h @@ -10,7 +10,7 @@ /* Update probabilities for the nodes in the token entropy tree. - Generated file included by entropy.c */ + Generated file included by vp9_entropy.c */ #define COEF_UPDATE_PROB 252 #define COEF_UPDATE_PROB_8X8 252 #define COEF_UPDATE_PROB_16X16 252 diff --git a/vp9/common/common.h b/vp9/common/vp9_common.h index bd34bf9b1..61c0e25d8 100644 --- a/vp9/common/common.h +++ b/vp9/common/vp9_common.h @@ -18,7 +18,7 @@ #include "vpx_mem/vpx_mem.h" -#include "common_types.h" +#include "vp9_common_types.h" /* Only need this for fixed-size arrays, for structs just assign. */ diff --git a/vp9/common/common_types.h b/vp9/common/vp9_common_types.h index 4e6248697..4e6248697 100644 --- a/vp9/common/common_types.h +++ b/vp9/common/vp9_common_types.h diff --git a/vp9/common/context.c b/vp9/common/vp9_context.c index 181a27f3e..90a1f796f 100644 --- a/vp9/common/context.c +++ b/vp9/common/vp9_context.c @@ -9,7 +9,7 @@ */ -#include "entropy.h" +#include "vp9_entropy.h" /* *** GENERATED FILE: DO NOT EDIT *** */ diff --git a/vp9/common/debugmodes.c b/vp9/common/vp9_debugmodes.c index 5cd84c51b..058abb57e 100644 --- a/vp9/common/debugmodes.c +++ b/vp9/common/vp9_debugmodes.c @@ -9,7 +9,7 @@ */ #include <stdio.h> -#include "blockd.h" +#include "vp9_blockd.h" void vp9_print_modes_and_motion_vectors(MODE_INFO *mi, int rows, int cols, int frame) { diff --git a/vp9/common/default_coef_probs.h b/vp9/common/vp9_default_coef_probs.h index 4caf8818d..52fb02f36 100644 --- a/vp9/common/default_coef_probs.h +++ b/vp9/common/vp9_default_coef_probs.h @@ -9,7 +9,7 @@ */ -/*Generated file, included by entropy.c*/ +/*Generated file, included by vp9_entropy.c*/ static const vp9_prob default_coef_probs [BLOCK_TYPES] diff --git a/vp9/common/entropy.c b/vp9/common/vp9_entropy.c index a4ecae09f..e6ee2729e 100644 --- a/vp9/common/entropy.c +++ b/vp9/common/vp9_entropy.c @@ -11,11 +11,11 @@ #include <stdio.h> -#include "entropy.h" +#include "vp9_entropy.h" #include "string.h" -#include "blockd.h" -#include "onyxc_int.h" -#include "entropymode.h" +#include "vp9_blockd.h" +#include "vp9_onyxc_int.h" +#include "vp9_entropymode.h" #include "vpx_mem/vpx_mem.h" #define uchar unsigned char /* typedefs can clash */ @@ -26,7 +26,7 @@ typedef const uint cuint; typedef vp9_prob Prob; -#include "coefupdateprobs.h" +#include "vp9_coefupdateprobs.h" const int vp9_i8x8_block[4] = {0, 2, 8, 10}; @@ -200,7 +200,7 @@ vp9_extra_bit_struct vp9_extra_bits[12] = { { 0, 0, 0, 0} }; -#include "default_coef_probs.h" +#include "vp9_default_coef_probs.h" void vp9_default_coef_probs(VP9_COMMON *pc) { vpx_memcpy(pc->fc.coef_probs, default_coef_probs, diff --git a/vp9/common/entropy.h b/vp9/common/vp9_entropy.h index fa24a058e..a2053609b 100644 --- a/vp9/common/entropy.h +++ b/vp9/common/vp9_entropy.h @@ -12,10 +12,10 @@ #ifndef __INC_ENTROPY_H #define __INC_ENTROPY_H -#include "treecoder.h" -#include "blockd.h" -#include "common.h" -#include "coefupdateprobs.h" +#include "vp9_treecoder.h" +#include "vp9_blockd.h" +#include "vp9_common.h" +#include "vp9_coefupdateprobs.h" extern const int vp9_i8x8_block[4]; diff --git a/vp9/common/entropymode.c b/vp9/common/vp9_entropymode.c index 5d3336916..69acbab02 100644 --- a/vp9/common/entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -9,8 +9,8 @@ */ -#include "onyxc_int.h" -#include "modecont.h" +#include "vp9_onyxc_int.h" +#include "vp9_modecont.h" #include "vpx_mem/vpx_mem.h" @@ -519,7 +519,7 @@ void vp9_update_mode_context(VP9_COMMON *pc) { } #ifdef MODE_STATS -#include "vp9/common/modecont.h" +#include "vp9/common/vp9_modecont.h" void print_mode_contexts(VP9_COMMON *pc) { int j, i; printf("\n====================\n"); diff --git a/vp9/common/entropymode.h b/vp9/common/vp9_entropymode.h index 9f20ae94d..aee6e6c76 100644 --- a/vp9/common/entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -12,8 +12,8 @@ #ifndef __INC_ENTROPYMODE_H #define __INC_ENTROPYMODE_H -#include "blockd.h" -#include "treecoder.h" +#include "vp9_blockd.h" +#include "vp9_treecoder.h" #define SUBMVREF_COUNT 5 #define VP9_NUMMBSPLITS 4 diff --git a/vp9/common/entropymv.c b/vp9/common/vp9_entropymv.c index 85c21ba2a..8d2ebebc4 100644 --- a/vp9/common/entropymv.c +++ b/vp9/common/vp9_entropymv.c @@ -9,8 +9,8 @@ */ -#include "onyxc_int.h" -#include "entropymv.h" +#include "vp9_onyxc_int.h" +#include "vp9_entropymv.h" //#define MV_COUNT_TESTING diff --git a/vp9/common/entropymv.h b/vp9/common/vp9_entropymv.h index 7a5fadff1..3be95117c 100644 --- a/vp9/common/entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -12,9 +12,9 @@ #ifndef __INC_ENTROPYMV_H #define __INC_ENTROPYMV_H -#include "treecoder.h" +#include "vp9_treecoder.h" #include "vpx_config.h" -#include "blockd.h" +#include "vp9_blockd.h" struct VP9Common; diff --git a/vp9/common/extend.c b/vp9/common/vp9_extend.c index ad3b89b44..4f2aa0e0c 100644 --- a/vp9/common/extend.c +++ b/vp9/common/vp9_extend.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "extend.h" +#include "vp9_extend.h" #include "vpx_mem/vpx_mem.h" static void copy_and_extend_plane(unsigned char *s, /* source */ diff --git a/vp9/common/extend.h b/vp9/common/vp9_extend.h index c3c590479..c3c590479 100644 --- a/vp9/common/extend.h +++ b/vp9/common/vp9_extend.h diff --git a/vp9/common/filter.c b/vp9/common/vp9_filter.c index 429f408c7..8d5eb9333 100644 --- a/vp9/common/filter.c +++ b/vp9/common/vp9_filter.c @@ -10,7 +10,7 @@ #include <stdlib.h> -#include "filter.h" +#include "vp9_filter.h" #include "vpx_ports/mem.h" #include "vp9_rtcd.h" diff --git a/vp9/common/filter.h b/vp9/common/vp9_filter.h index c194887dc..c194887dc 100644 --- a/vp9/common/filter.h +++ b/vp9/common/vp9_filter.h diff --git a/vp9/common/findnearmv.c b/vp9/common/vp9_findnearmv.c index a551db810..bfbac4e18 100644 --- a/vp9/common/findnearmv.c +++ b/vp9/common/vp9_findnearmv.c @@ -9,9 +9,9 @@ */ -#include "findnearmv.h" -#include "vp9/common/sadmxn.h" -#include "vp9/common/subpelvar.h" +#include "vp9_findnearmv.h" +#include "vp9/common/vp9_sadmxn.h" +#include "vp9/common/vp9_subpelvar.h" #include <limits.h> const unsigned char vp9_mbsplit_offset[4][16] = { diff --git a/vp9/common/findnearmv.h b/vp9/common/vp9_findnearmv.h index 4e6418a51..759bdbaff 100644 --- a/vp9/common/findnearmv.h +++ b/vp9/common/vp9_findnearmv.h @@ -12,10 +12,10 @@ #ifndef __INC_FINDNEARMV_H #define __INC_FINDNEARMV_H -#include "mv.h" -#include "blockd.h" -#include "treecoder.h" -#include "onyxc_int.h" +#include "vp9_mv.h" +#include "vp9_blockd.h" +#include "vp9_treecoder.h" +#include "vp9_onyxc_int.h" /* check a list of motion vectors by sad score using a number rows of pixels * above and a number cols of pixels in the left to select the one with best diff --git a/vp9/common/header.h b/vp9/common/vp9_header.h index a88b6e3e3..a88b6e3e3 100644 --- a/vp9/common/header.h +++ b/vp9/common/vp9_header.h diff --git a/vp9/common/idctllm.c b/vp9/common/vp9_idctllm.c index 55b7a8571..9d559ed22 100644 --- a/vp9/common/idctllm.c +++ b/vp9/common/vp9_idctllm.c @@ -25,9 +25,9 @@ #include <assert.h> #include <math.h> #include "vpx_ports/config.h" -#include "vp9/common/systemdependent.h" +#include "vp9/common/vp9_systemdependent.h" -#include "vp9/common/blockd.h" +#include "vp9/common/vp9_blockd.h" static const int cospi8sqrt2minus1 = 20091; static const int sinpi8sqrt2 = 35468; diff --git a/vp9/common/implicit_segmentation.c b/vp9/common/vp9_implicit_segmentation.c index 9194e2a30..472c3d1a5 100644 --- a/vp9/common/implicit_segmentation.c +++ b/vp9/common/vp9_implicit_segmentation.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9/common/onyxc_int.h" +#include "vp9/common/vp9_onyxc_int.h" #define MAX_REGIONS 24000 #ifndef NULL diff --git a/vp9/common/invtrans.c b/vp9/common/vp9_invtrans.c index ac5553e6e..76eb10307 100644 --- a/vp9/common/invtrans.c +++ b/vp9/common/vp9_invtrans.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "invtrans.h" +#include "vp9_invtrans.h" #include "./vp9_rtcd.h" static void recon_dcblock(MACROBLOCKD *xd) { diff --git a/vp9/common/invtrans.h b/vp9/common/vp9_invtrans.h index 58dc4d704..0e50c45d7 100644 --- a/vp9/common/invtrans.h +++ b/vp9/common/vp9_invtrans.h @@ -12,7 +12,7 @@ #define __INC_INVTRANS_H #include "vpx_ports/config.h" -#include "blockd.h" +#include "vp9_blockd.h" extern void vp9_inverse_transform_b_4x4(MACROBLOCKD *xd, int block, int pitch); diff --git a/vp9/common/loopfilter.c b/vp9/common/vp9_loopfilter.c index 0d295c66a..73b343974 100644 --- a/vp9/common/loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -9,11 +9,11 @@ */ #include "vpx_config.h" -#include "loopfilter.h" -#include "onyxc_int.h" +#include "vp9_loopfilter.h" +#include "vp9_onyxc_int.h" #include "vpx_mem/vpx_mem.h" -#include "vp9/common/seg_common.h" +#include "vp9/common/vp9_seg_common.h" static void lf_init_lut(loop_filter_info_n *lfi) { int filt_lvl; diff --git a/vp9/common/loopfilter.h b/vp9/common/vp9_loopfilter.h index 0b7de682c..b3254f692 100644 --- a/vp9/common/loopfilter.h +++ b/vp9/common/vp9_loopfilter.h @@ -13,7 +13,7 @@ #include "vpx_ports/mem.h" #include "vpx_config.h" -#include "blockd.h" +#include "vp9_blockd.h" #define MAX_LOOP_FILTER 63 @@ -64,11 +64,11 @@ struct loop_filter_info { void sym(unsigned char *y, int ystride, const unsigned char *blimit) #if ARCH_X86 || ARCH_X86_64 -#include "x86/loopfilter_x86.h" +#include "x86/vp9_loopfilter_x86.h" #endif #if ARCH_ARM -#include "arm/loopfilter_arm.h" +#include "arm/vp9_loopfilter_arm.h" #endif typedef void loop_filter_uvfunction(unsigned char *u, /* source pointer */ diff --git a/vp9/common/loopfilter_filters.c b/vp9/common/vp9_loopfilter_filters.c index c719b44c3..9fd6c5fa6 100644 --- a/vp9/common/loopfilter_filters.c +++ b/vp9/common/vp9_loopfilter_filters.c @@ -10,8 +10,8 @@ #include <stdlib.h> #include "vpx_config.h" -#include "loopfilter.h" -#include "onyxc_int.h" +#include "vp9_loopfilter.h" +#include "vp9_onyxc_int.h" typedef unsigned char uc; diff --git a/vp9/common/maskingmv.c b/vp9/common/vp9_maskingmv.c index 05cfb4a46..f1151e3dc 100644 --- a/vp9/common/maskingmv.c +++ b/vp9/common/vp9_maskingmv.c @@ -1,6 +1,6 @@ /* ============================================================================ - Name : maskingmv.c + Name : vp9_maskingmv.c Author : jimbankoski Version : Copyright : Your copyright notice diff --git a/vp9/common/mbpitch.c b/vp9/common/vp9_mbpitch.c index 5ef4dd618..b42db987a 100644 --- a/vp9/common/mbpitch.c +++ b/vp9/common/vp9_mbpitch.c @@ -9,7 +9,7 @@ */ -#include "blockd.h" +#include "vp9_blockd.h" typedef enum { PRED = 0, diff --git a/vp9/common/modecont.c b/vp9/common/vp9_modecont.c index 1a71eceb5..2f5bbd2ba 100644 --- a/vp9/common/modecont.c +++ b/vp9/common/vp9_modecont.c @@ -9,7 +9,7 @@ */ -#include "entropy.h" +#include "vp9_entropy.h" const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4] = { {223, 1, 1, 237}, // 0,0 best: Only candidate diff --git a/vp9/common/modecont.h b/vp9/common/vp9_modecont.h index 1fa4558e1..1fa4558e1 100644 --- a/vp9/common/modecont.h +++ b/vp9/common/vp9_modecont.h diff --git a/vp9/common/modecontext.c b/vp9/common/vp9_modecontext.c index 522498609..e18cf63c1 100644 --- a/vp9/common/modecontext.c +++ b/vp9/common/vp9_modecontext.c @@ -9,7 +9,7 @@ */ -#include "entropymode.h" +#include "vp9_entropymode.h" const unsigned int vp9_kf_default_bmode_counts[VP9_KF_BINTRAMODES] [VP9_KF_BINTRAMODES] diff --git a/vp9/common/mv.h b/vp9/common/vp9_mv.h index bbe6d2c8b..bbe6d2c8b 100644 --- a/vp9/common/mv.h +++ b/vp9/common/vp9_mv.h diff --git a/vp9/common/mvref_common.c b/vp9/common/vp9_mvref_common.c index ebb8fa4bd..33dc3fa5b 100644 --- a/vp9/common/mvref_common.c +++ b/vp9/common/vp9_mvref_common.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "mvref_common.h" +#include "vp9_mvref_common.h" #define MVREF_NEIGHBOURS 8 static int mb_mv_ref_search[MVREF_NEIGHBOURS][2] = { diff --git a/vp9/common/mvref_common.h b/vp9/common/vp9_mvref_common.h index 06050406b..9a1877919 100644 --- a/vp9/common/mvref_common.h +++ b/vp9/common/vp9_mvref_common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "onyxc_int.h" -#include "blockd.h" +#include "vp9_onyxc_int.h" +#include "vp9_blockd.h" #ifndef __INC_MVREF_COMMON_H diff --git a/vp9/common/onyx.h b/vp9/common/vp9_onyx.h index 0f84e8cec..92ec667e7 100644 --- a/vp9/common/onyx.h +++ b/vp9/common/vp9_onyx.h @@ -20,8 +20,8 @@ extern "C" #include "vpx/internal/vpx_codec_internal.h" #include "vpx/vp8cx.h" #include "vpx_scale/yv12config.h" -#include "type_aliases.h" -#include "ppflags.h" +#include "vp9_type_aliases.h" +#include "vp9_ppflags.h" typedef int *VP9_PTR; /* Create/destroy static data structures. */ diff --git a/vp9/common/onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 27a6ca132..18750e767 100644 --- a/vp9/common/onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -15,16 +15,16 @@ #include "vpx_config.h" #include "vpx/internal/vpx_codec_internal.h" #include "vp9_rtcd.h" -#include "loopfilter.h" -#include "entropymv.h" -#include "entropy.h" -#include "entropymode.h" +#include "vp9_loopfilter.h" +#include "vp9_entropymv.h" +#include "vp9_entropy.h" +#include "vp9_entropymode.h" #if CONFIG_POSTPROC -#include "postproc.h" +#include "vp9_postproc.h" #endif /*#ifdef PACKET_TESTING*/ -#include "header.h" +#include "vp9_header.h" /*#endif*/ /* Create/destroy static data structures. */ diff --git a/vp9/common/onyxd.h b/vp9/common/vp9_onyxd.h index 7b7662b3c..2fc51db96 100644 --- a/vp9/common/onyxd.h +++ b/vp9/common/vp9_onyxd.h @@ -18,9 +18,9 @@ extern "C" { #endif -#include "type_aliases.h" +#include "vp9_type_aliases.h" #include "vpx_scale/yv12config.h" -#include "ppflags.h" +#include "vp9_ppflags.h" #include "vpx_ports/mem.h" #include "vpx/vpx_codec.h" diff --git a/vp9/common/postproc.c b/vp9/common/vp9_postproc.c index 4c5748e7a..5752fbd82 100644 --- a/vp9/common/postproc.c +++ b/vp9/common/vp9_postproc.c @@ -11,10 +11,10 @@ #include "vpx_ports/config.h" #include "vpx_scale/yv12config.h" -#include "postproc.h" -#include "vp9/common/textblit.h" +#include "vp9_postproc.h" +#include "vp9/common/vp9_textblit.h" #include "vpx_scale/vpxscale.h" -#include "systemdependent.h" +#include "vp9_systemdependent.h" #include <math.h> #include <stdlib.h> diff --git a/vp9/common/postproc.h b/vp9/common/vp9_postproc.h index f43a8f08a..bf56b5692 100644 --- a/vp9/common/postproc.h +++ b/vp9/common/vp9_postproc.h @@ -37,7 +37,7 @@ int y1, int u1, int v1, int alpha, int stride) #if ARCH_X86 || ARCH_X86_64 -#include "x86/postproc_x86.h" +#include "x86/vp9_postproc_x86.h" #endif #ifndef vp9_postproc_down @@ -106,8 +106,8 @@ struct postproc_state { DECLARE_ALIGNED(16, char, whiteclamp[16]); DECLARE_ALIGNED(16, char, bothclamp[16]); }; -#include "onyxc_int.h" -#include "ppflags.h" +#include "vp9_onyxc_int.h" +#include "vp9_ppflags.h" int vp9_post_proc_frame(struct VP9Common *oci, YV12_BUFFER_CONFIG *dest, vp9_ppflags_t *flags); diff --git a/vp9/common/ppflags.h b/vp9/common/vp9_ppflags.h index fd8371180..fd8371180 100644 --- a/vp9/common/ppflags.h +++ b/vp9/common/vp9_ppflags.h diff --git a/vp9/common/pragmas.h b/vp9/common/vp9_pragmas.h index 99fee5ae2..99fee5ae2 100644 --- a/vp9/common/pragmas.h +++ b/vp9/common/vp9_pragmas.h diff --git a/vp9/common/pred_common.c b/vp9/common/vp9_pred_common.c index d779c641d..cb65d7282 100644 --- a/vp9/common/pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -9,8 +9,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9/common/pred_common.h" -#include "vp9/common/seg_common.h" +#include "vp9/common/vp9_pred_common.h" +#include "vp9/common/vp9_seg_common.h" // TBD prediction functions for various bitstream signals diff --git a/vp9/common/pred_common.h b/vp9/common/vp9_pred_common.h index 33656f23a..2628bb3ca 100644 --- a/vp9/common/pred_common.h +++ b/vp9/common/vp9_pred_common.h @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "type_aliases.h" -#include "onyxc_int.h" -#include "vp9/common/blockd.h" +#include "vp9_type_aliases.h" +#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_blockd.h" #ifndef __INC_PRED_COMMON_H__ #define __INC_PRED_COMMON_H__ 1 diff --git a/vp9/common/quant_common.c b/vp9/common/vp9_quant_common.c index 720b27113..5d1f2594a 100644 --- a/vp9/common/quant_common.c +++ b/vp9/common/vp9_quant_common.c @@ -9,7 +9,7 @@ */ -#include "quant_common.h" +#include "vp9_quant_common.h" static int dc_qlookup[QINDEX_RANGE]; static int ac_qlookup[QINDEX_RANGE]; diff --git a/vp9/common/quant_common.h b/vp9/common/vp9_quant_common.h index 2978dd8a2..88588d5d2 100644 --- a/vp9/common/quant_common.h +++ b/vp9/common/vp9_quant_common.h @@ -10,8 +10,8 @@ #include "string.h" -#include "blockd.h" -#include "onyxc_int.h" +#include "vp9_blockd.h" +#include "vp9_onyxc_int.h" extern void vp9_init_quant_tables(); extern int vp9_ac_yquant(int QIndex); diff --git a/vp9/common/recon.c b/vp9/common/vp9_recon.c index 77035668e..9c9029f2a 100644 --- a/vp9/common/recon.c +++ b/vp9/common/vp9_recon.c @@ -11,7 +11,7 @@ #include "vpx_ports/config.h" #include "vp9_rtcd.h" -#include "blockd.h" +#include "vp9_blockd.h" void vp9_recon_b_c ( diff --git a/vp9/common/reconinter.c b/vp9/common/vp9_reconinter.c index 37478f71e..eac07ae19 100644 --- a/vp9/common/reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -11,11 +11,11 @@ #include "vpx_ports/config.h" #include "vpx/vpx_integer.h" -#include "blockd.h" -#include "reconinter.h" -#include "vp9/common/reconintra.h" +#include "vp9_blockd.h" +#include "vp9_reconinter.h" +#include "vp9/common/vp9_reconintra.h" #if CONFIG_RUNTIME_CPU_DETECT -#include "onyxc_int.h" +#include "vp9_onyxc_int.h" #endif void vp9_setup_interp_filters(MACROBLOCKD *xd, @@ -368,7 +368,7 @@ void filter_mb(unsigned char *src, int src_stride, } } #else -// Based on vp9_post_proc_down_and_across_c (postproc.c) +// Based on vp9_post_proc_down_and_across_c (vp9_postproc.c) void filter_mb(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int width, int height) { diff --git a/vp9/common/reconinter.h b/vp9/common/vp9_reconinter.h index ad1cf9197..25a8adc3b 100644 --- a/vp9/common/reconinter.h +++ b/vp9/common/vp9_reconinter.h @@ -11,7 +11,7 @@ #ifndef __INC_RECONINTER_H #define __INC_RECONINTER_H -#include "onyxc_int.h" +#include "vp9_onyxc_int.h" extern void vp9_build_1st_inter16x16_predictors_mby(MACROBLOCKD *xd, unsigned char *dst_y, diff --git a/vp9/common/reconintra.c b/vp9/common/vp9_reconintra.c index 89533c7ae..8199b94ae 100644 --- a/vp9/common/reconintra.c +++ b/vp9/common/vp9_reconintra.c @@ -11,7 +11,7 @@ #include <stdio.h> #include "vpx_ports/config.h" #include "vp9_rtcd.h" -#include "reconintra.h" +#include "vp9_reconintra.h" #include "vpx_mem/vpx_mem.h" /* For skip_recon_mb(), add vp9_build_intra_predictors_mby_s(MACROBLOCKD *xd) diff --git a/vp9/common/reconintra.h b/vp9/common/vp9_reconintra.h index c72e8e912..dd35b06ad 100644 --- a/vp9/common/reconintra.h +++ b/vp9/common/vp9_reconintra.h @@ -11,7 +11,7 @@ #ifndef __INC_RECONINTRA_H #define __INC_RECONINTRA_H -#include "blockd.h" +#include "vp9_blockd.h" extern void vp9_recon_intra_mbuv(MACROBLOCKD *xd); extern B_PREDICTION_MODE vp9_find_dominant_direction(unsigned char *ptr, diff --git a/vp9/common/reconintra4x4.c b/vp9/common/vp9_reconintra4x4.c index 1cf960cb7..d5203acd0 100644 --- a/vp9/common/reconintra4x4.c +++ b/vp9/common/vp9_reconintra4x4.c @@ -11,7 +11,7 @@ #include "vpx_ports/config.h" #include "vpx_mem/vpx_mem.h" -#include "reconintra.h" +#include "vp9_reconintra.h" #include "vp9_rtcd.h" #if CONFIG_NEWBINTRAMODES diff --git a/vp9/common/reconintra4x4.h b/vp9/common/vp9_reconintra4x4.h index 79a048076..79a048076 100644 --- a/vp9/common/reconintra4x4.h +++ b/vp9/common/vp9_reconintra4x4.h diff --git a/vp9/common/rtcd.c b/vp9/common/vp9_rtcd.c index 277d5b217..277d5b217 100644 --- a/vp9/common/rtcd.c +++ b/vp9/common/vp9_rtcd.c diff --git a/vp9/common/rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index ea134a854..ea134a854 100644 --- a/vp9/common/rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh diff --git a/vp9/common/sadmxn.h b/vp9/common/vp9_sadmxn.h index 47b8dfc58..47b8dfc58 100644 --- a/vp9/common/sadmxn.h +++ b/vp9/common/vp9_sadmxn.h diff --git a/vp9/common/seg_common.c b/vp9/common/vp9_seg_common.c index 0ca55ffd8..6ac27e396 100644 --- a/vp9/common/seg_common.c +++ b/vp9/common/vp9_seg_common.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9/common/seg_common.h" +#include "vp9/common/vp9_seg_common.h" static const int segfeaturedata_signed[SEG_LVL_MAX] = { 1, 1, 0, 0, 0, 0 }; static const int seg_feature_data_bits[SEG_LVL_MAX] = diff --git a/vp9/common/seg_common.h b/vp9/common/vp9_seg_common.h index 58edf1612..fb0570c6b 100644 --- a/vp9/common/seg_common.h +++ b/vp9/common/vp9_seg_common.h @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "type_aliases.h" -#include "onyxc_int.h" -#include "vp9/common/blockd.h" +#include "vp9_type_aliases.h" +#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_blockd.h" #ifndef __INC_SEG_COMMON_H__ #define __INC_SEG_COMMON_H__ 1 diff --git a/vp9/common/setupintrarecon.c b/vp9/common/vp9_setupintrarecon.c index 9cb037228..3fe4e3e50 100644 --- a/vp9/common/setupintrarecon.c +++ b/vp9/common/vp9_setupintrarecon.c @@ -9,7 +9,7 @@ */ -#include "setupintrarecon.h" +#include "vp9_setupintrarecon.h" #include "vpx_mem/vpx_mem.h" void vp9_setup_intra_recon(YV12_BUFFER_CONFIG *ybf) { diff --git a/vp9/common/setupintrarecon.h b/vp9/common/vp9_setupintrarecon.h index 1a55d0ad6..1a55d0ad6 100644 --- a/vp9/common/setupintrarecon.h +++ b/vp9/common/vp9_setupintrarecon.h diff --git a/vp9/common/subpelvar.h b/vp9/common/vp9_subpelvar.h index 83cc2a7ce..b3c3fcdaf 100644 --- a/vp9/common/subpelvar.h +++ b/vp9/common/vp9_subpelvar.h @@ -9,7 +9,7 @@ */ -#include "vp9/common/filter.h" +#include "vp9/common/vp9_filter.h" diff --git a/vp9/common/subpixel.h b/vp9/common/vp9_subpixel.h index 2b8429198..2b8429198 100644 --- a/vp9/common/subpixel.h +++ b/vp9/common/vp9_subpixel.h diff --git a/vp9/common/swapyv12buffer.c b/vp9/common/vp9_swapyv12buffer.c index 13fc8d4bc..7882e0be0 100644 --- a/vp9/common/swapyv12buffer.c +++ b/vp9/common/vp9_swapyv12buffer.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "swapyv12buffer.h" +#include "vp9_swapyv12buffer.h" void vp9_swap_yv12_buffer(YV12_BUFFER_CONFIG *new_frame, YV12_BUFFER_CONFIG *last_frame) { diff --git a/vp9/common/swapyv12buffer.h b/vp9/common/vp9_swapyv12buffer.h index 44ed5e84d..44ed5e84d 100644 --- a/vp9/common/swapyv12buffer.h +++ b/vp9/common/vp9_swapyv12buffer.h diff --git a/vp9/common/systemdependent.h b/vp9/common/vp9_systemdependent.h index 5d778bcd0..5d778bcd0 100644 --- a/vp9/common/systemdependent.h +++ b/vp9/common/vp9_systemdependent.h diff --git a/vp9/common/tapify.py b/vp9/common/vp9_tapify.py index 99529cff0..99529cff0 100644 --- a/vp9/common/tapify.py +++ b/vp9/common/vp9_tapify.py diff --git a/vp9/common/textblit.c b/vp9/common/vp9_textblit.c index 601d298dc..52c6b87c6 100644 --- a/vp9/common/textblit.c +++ b/vp9/common/vp9_textblit.c @@ -10,7 +10,7 @@ #include <stdlib.h> -#include "vp9/common/textblit.h" +#include "vp9/common/vp9_textblit.h" void vp9_blit_text(const char *msg, unsigned char *address, const int pitch) { int letter_bitmap; diff --git a/vp9/common/textblit.h b/vp9/common/vp9_textblit.h index 39edbb09d..39edbb09d 100644 --- a/vp9/common/textblit.h +++ b/vp9/common/vp9_textblit.h diff --git a/vp9/common/treecoder.c b/vp9/common/vp9_treecoder.c index 39629406e..096dd59e5 100644 --- a/vp9/common/treecoder.c +++ b/vp9/common/vp9_treecoder.c @@ -16,7 +16,7 @@ #endif #include <stdio.h> -#include "treecoder.h" +#include "vp9_treecoder.h" static void tree2tok( struct vp9_token_struct *const p, diff --git a/vp9/common/treecoder.h b/vp9/common/vp9_treecoder.h index 92b92ef55..92b92ef55 100644 --- a/vp9/common/treecoder.h +++ b/vp9/common/vp9_treecoder.h diff --git a/vp9/common/type_aliases.h b/vp9/common/vp9_type_aliases.h index eda6a2ec2..91939ee19 100644 --- a/vp9/common/type_aliases.h +++ b/vp9/common/vp9_type_aliases.h @@ -11,7 +11,7 @@ /**************************************************************************** * -* Module Title : type_aliases.h +* Module Title : vp9_type_aliases.h * * Description : Standard type aliases * diff --git a/vp9/common/x86/filter_sse2.c b/vp9/common/x86/vp9_filter_sse2.c index 92d0a2e5b..09f8de384 100644 --- a/vp9/common/x86/filter_sse2.c +++ b/vp9/common/x86/vp9_filter_sse2.c @@ -10,7 +10,7 @@ #include <assert.h> // for alignment checks #include <emmintrin.h> // SSE2 -#include "vp9/common/filter.h" +#include "vp9/common/vp9_filter.h" #include "vpx_ports/mem.h" // for DECLARE_ALIGNED #include "vp9_rtcd.h" diff --git a/vp9/common/x86/filter_sse4.c b/vp9/common/x86/vp9_filter_sse4.c index 9efe9f44a..52c35b296 100644 --- a/vp9/common/x86/filter_sse4.c +++ b/vp9/common/x86/vp9_filter_sse4.c @@ -10,7 +10,7 @@ #include <assert.h> // for alignment checks #include <smmintrin.h> // SSE4.1 -#include "vp9/common/filter.h" +#include "vp9/common/vp9_filter.h" #include "vpx_ports/mem.h" // for DECLARE_ALIGNED #include "vp9_rtcd.h" diff --git a/vp9/common/x86/idct_x86.h b/vp9/common/x86/vp9_idct_x86.h index 297ab0d33..297ab0d33 100644 --- a/vp9/common/x86/idct_x86.h +++ b/vp9/common/x86/vp9_idct_x86.h diff --git a/vp9/common/x86/idctllm_mmx.asm b/vp9/common/x86/vp9_idctllm_mmx.asm index 15e81addb..15e81addb 100644 --- a/vp9/common/x86/idctllm_mmx.asm +++ b/vp9/common/x86/vp9_idctllm_mmx.asm diff --git a/vp9/common/x86/idctllm_sse2.asm b/vp9/common/x86/vp9_idctllm_sse2.asm index daa572e01..daa572e01 100644 --- a/vp9/common/x86/idctllm_sse2.asm +++ b/vp9/common/x86/vp9_idctllm_sse2.asm diff --git a/vp9/common/x86/iwalsh_mmx.asm b/vp9/common/x86/vp9_iwalsh_mmx.asm index 6b276b95a..6b276b95a 100644 --- a/vp9/common/x86/iwalsh_mmx.asm +++ b/vp9/common/x86/vp9_iwalsh_mmx.asm diff --git a/vp9/common/x86/iwalsh_sse2.asm b/vp9/common/x86/vp9_iwalsh_sse2.asm index 143cce87d..143cce87d 100644 --- a/vp9/common/x86/iwalsh_sse2.asm +++ b/vp9/common/x86/vp9_iwalsh_sse2.asm diff --git a/vp9/common/x86/loopfilter_mmx.asm b/vp9/common/x86/vp9_loopfilter_mmx.asm index ac3f74eda..ac3f74eda 100644 --- a/vp9/common/x86/loopfilter_mmx.asm +++ b/vp9/common/x86/vp9_loopfilter_mmx.asm diff --git a/vp9/common/x86/loopfilter_sse2.asm b/vp9/common/x86/vp9_loopfilter_sse2.asm index 9c0c4b000..9c0c4b000 100644 --- a/vp9/common/x86/loopfilter_sse2.asm +++ b/vp9/common/x86/vp9_loopfilter_sse2.asm diff --git a/vp9/common/x86/loopfilter_x86.c b/vp9/common/x86/vp9_loopfilter_x86.c index 1ce654092..af8bb6922 100644 --- a/vp9/common/x86/loopfilter_x86.c +++ b/vp9/common/x86/vp9_loopfilter_x86.c @@ -10,7 +10,7 @@ #include <emmintrin.h> // SSE2 #include "vpx_config.h" -#include "vp9/common/loopfilter.h" +#include "vp9/common/vp9_loopfilter.h" prototype_loopfilter(vp9_loop_filter_vertical_edge_mmx); prototype_loopfilter(vp9_loop_filter_horizontal_edge_mmx); diff --git a/vp9/common/x86/loopfilter_x86.h b/vp9/common/x86/vp9_loopfilter_x86.h index 25cf383c9..25cf383c9 100644 --- a/vp9/common/x86/loopfilter_x86.h +++ b/vp9/common/x86/vp9_loopfilter_x86.h diff --git a/vp9/common/x86/mask_sse3.asm b/vp9/common/x86/vp9_mask_sse3.asm index 0d90cfa86..0d90cfa86 100644 --- a/vp9/common/x86/mask_sse3.asm +++ b/vp9/common/x86/vp9_mask_sse3.asm diff --git a/vp9/common/x86/postproc_mmx.asm b/vp9/common/x86/vp9_postproc_mmx.asm index fa2152bab..fa2152bab 100644 --- a/vp9/common/x86/postproc_mmx.asm +++ b/vp9/common/x86/vp9_postproc_mmx.asm diff --git a/vp9/common/x86/postproc_sse2.asm b/vp9/common/x86/vp9_postproc_sse2.asm index 91758e62d..91758e62d 100644 --- a/vp9/common/x86/postproc_sse2.asm +++ b/vp9/common/x86/vp9_postproc_sse2.asm diff --git a/vp9/common/x86/postproc_x86.h b/vp9/common/x86/vp9_postproc_x86.h index a4c4f8c74..a4c4f8c74 100644 --- a/vp9/common/x86/postproc_x86.h +++ b/vp9/common/x86/vp9_postproc_x86.h diff --git a/vp9/common/x86/recon_mmx.asm b/vp9/common/x86/vp9_recon_mmx.asm index 20f582dba..20f582dba 100644 --- a/vp9/common/x86/recon_mmx.asm +++ b/vp9/common/x86/vp9_recon_mmx.asm diff --git a/vp9/common/x86/recon_sse2.asm b/vp9/common/x86/vp9_recon_sse2.asm index c7cd23fc7..c7cd23fc7 100644 --- a/vp9/common/x86/recon_sse2.asm +++ b/vp9/common/x86/vp9_recon_sse2.asm diff --git a/vp9/common/x86/recon_wrapper_sse2.c b/vp9/common/x86/vp9_recon_wrapper_sse2.c index d20e13871..49b36dbd6 100644 --- a/vp9/common/x86/recon_wrapper_sse2.c +++ b/vp9/common/x86/vp9_recon_wrapper_sse2.c @@ -10,7 +10,7 @@ #include "vpx_ports/config.h" #include "vpx_mem/vpx_mem.h" -#include "vp9/common/blockd.h" +#include "vp9/common/vp9_blockd.h" #define build_intra_predictors_mbuv_prototype(sym) \ void sym(unsigned char *dst, int dst_stride, \ diff --git a/vp9/common/x86/sadmxn_x86.c b/vp9/common/x86/vp9_sadmxn_x86.c index 0b783ccea..0b783ccea 100644 --- a/vp9/common/x86/sadmxn_x86.c +++ b/vp9/common/x86/vp9_sadmxn_x86.c diff --git a/vp9/common/x86/subpixel_8t_ssse3.asm b/vp9/common/x86/vp9_subpixel_8t_ssse3.asm index dd89710e8..dd89710e8 100644 --- a/vp9/common/x86/subpixel_8t_ssse3.asm +++ b/vp9/common/x86/vp9_subpixel_8t_ssse3.asm diff --git a/vp9/common/x86/subpixel_mmx.asm b/vp9/common/x86/vp9_subpixel_mmx.asm index 2f757fa80..2f757fa80 100644 --- a/vp9/common/x86/subpixel_mmx.asm +++ b/vp9/common/x86/vp9_subpixel_mmx.asm diff --git a/vp9/common/x86/subpixel_sse2.asm b/vp9/common/x86/vp9_subpixel_sse2.asm index f62587406..f62587406 100644 --- a/vp9/common/x86/subpixel_sse2.asm +++ b/vp9/common/x86/vp9_subpixel_sse2.asm diff --git a/vp9/common/x86/subpixel_ssse3.asm b/vp9/common/x86/vp9_subpixel_ssse3.asm index 4a16f1928..4a16f1928 100644 --- a/vp9/common/x86/subpixel_ssse3.asm +++ b/vp9/common/x86/vp9_subpixel_ssse3.asm diff --git a/vp9/common/x86/subpixel_x86.h b/vp9/common/x86/vp9_subpixel_x86.h index 4c224da3b..4c224da3b 100644 --- a/vp9/common/x86/subpixel_x86.h +++ b/vp9/common/x86/vp9_subpixel_x86.h diff --git a/vp9/common/x86/vp8_asm_stubs.c b/vp9/common/x86/vp9_vp8_asm_stubs.c index 817a93e24..f804af698 100644 --- a/vp9/common/x86/vp8_asm_stubs.c +++ b/vp9/common/x86/vp9_vp8_asm_stubs.c @@ -11,7 +11,7 @@ #include "vpx_ports/config.h" #include "vpx_ports/mem.h" -#include "vp9/common/subpixel.h" +#include "vp9/common/vp9_subpixel.h" extern const short vp9_six_tap_mmx[16][6 * 8]; diff --git a/vp9/common/x86/x86_systemdependent.c b/vp9/common/x86/vp9_x86_systemdependent.c index 62e75ffde..8a9f04c9a 100644 --- a/vp9/common/x86/x86_systemdependent.c +++ b/vp9/common/x86/vp9_x86_systemdependent.c @@ -10,9 +10,9 @@ #include "vpx_config.h" #include "vpx_ports/x86.h" -#include "vp9/common/loopfilter.h" -#include "vp9/common/pragmas.h" -#include "vp9/common/onyxc_int.h" +#include "vp9/common/vp9_loopfilter.h" +#include "vp9/common/vp9_pragmas.h" +#include "vp9/common/vp9_onyxc_int.h" void vp9_arch_x86_common_init(VP9_COMMON *ctx) { #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp9/decoder/arm/armv6/dequant_dc_idct_v6.asm b/vp9/decoder/arm/armv6/vp9_dequant_dc_idct_v6.asm index 6bebda24f..6bebda24f 100644 --- a/vp9/decoder/arm/armv6/dequant_dc_idct_v6.asm +++ b/vp9/decoder/arm/armv6/vp9_dequant_dc_idct_v6.asm diff --git a/vp9/decoder/arm/armv6/dequant_idct_v6.asm b/vp9/decoder/arm/armv6/vp9_dequant_idct_v6.asm index 47b671ca6..47b671ca6 100644 --- a/vp9/decoder/arm/armv6/dequant_idct_v6.asm +++ b/vp9/decoder/arm/armv6/vp9_dequant_idct_v6.asm diff --git a/vp9/decoder/arm/armv6/dequantize_v6.asm b/vp9/decoder/arm/armv6/vp9_dequantize_v6.asm index 72f7e0ee5..72f7e0ee5 100644 --- a/vp9/decoder/arm/armv6/dequantize_v6.asm +++ b/vp9/decoder/arm/armv6/vp9_dequantize_v6.asm diff --git a/vp9/decoder/arm/armv6/idct_blk_v6.c b/vp9/decoder/arm/armv6/vp9_idct_blk_v6.c index bf0c8141d..d4fa4b52f 100644 --- a/vp9/decoder/arm/armv6/idct_blk_v6.c +++ b/vp9/decoder/arm/armv6/vp9_idct_blk_v6.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "vp9/common/blockd.h" -#include "vp9/decoder/dequantize.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/decoder/vp9_dequantize.h" void vp8_dequant_dc_idct_add_y_block_v6(short *q, short *dq, unsigned char *pre, diff --git a/vp9/decoder/arm/neon/dequant_idct_neon.asm b/vp9/decoder/arm/neon/vp9_dequant_idct_neon.asm index 4bf661857..4bf661857 100644 --- a/vp9/decoder/arm/neon/dequant_idct_neon.asm +++ b/vp9/decoder/arm/neon/vp9_dequant_idct_neon.asm diff --git a/vp9/decoder/arm/neon/dequantizeb_neon.asm b/vp9/decoder/arm/neon/vp9_dequantizeb_neon.asm index c8e0c31f2..c8e0c31f2 100644 --- a/vp9/decoder/arm/neon/dequantizeb_neon.asm +++ b/vp9/decoder/arm/neon/vp9_dequantizeb_neon.asm diff --git a/vp9/decoder/arm/neon/idct_blk_neon.c b/vp9/decoder/arm/neon/vp9_idct_blk_neon.c index cc68fd496..f2620d972 100644 --- a/vp9/decoder/arm/neon/idct_blk_neon.c +++ b/vp9/decoder/arm/neon/vp9_idct_blk_neon.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "vp9/common/blockd.h" -#include "vp9/decoder/dequantize.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/decoder/vp9_dequantize.h" /* place these declarations here because we don't want to maintain them * outside of this scope diff --git a/vp9/decoder/arm/neon/idct_dequant_0_2x_neon.asm b/vp9/decoder/arm/neon/vp9_idct_dequant_0_2x_neon.asm index 456f8e1d4..456f8e1d4 100644 --- a/vp9/decoder/arm/neon/idct_dequant_0_2x_neon.asm +++ b/vp9/decoder/arm/neon/vp9_idct_dequant_0_2x_neon.asm diff --git a/vp9/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm b/vp9/decoder/arm/neon/vp9_idct_dequant_dc_0_2x_neon.asm index 0dc036acb..0dc036acb 100644 --- a/vp9/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm +++ b/vp9/decoder/arm/neon/vp9_idct_dequant_dc_0_2x_neon.asm diff --git a/vp9/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm b/vp9/decoder/arm/neon/vp9_idct_dequant_dc_full_2x_neon.asm index 61fa66075..61fa66075 100644 --- a/vp9/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm +++ b/vp9/decoder/arm/neon/vp9_idct_dequant_dc_full_2x_neon.asm diff --git a/vp9/decoder/arm/neon/idct_dequant_full_2x_neon.asm b/vp9/decoder/arm/neon/vp9_idct_dequant_full_2x_neon.asm index 772ec4685..772ec4685 100644 --- a/vp9/decoder/arm/neon/idct_dequant_full_2x_neon.asm +++ b/vp9/decoder/arm/neon/vp9_idct_dequant_full_2x_neon.asm diff --git a/vp9/decoder/arm/dequantize_arm.c b/vp9/decoder/arm/vp9_dequantize_arm.c index 5ec78f39f..ff1eec640 100644 --- a/vp9/decoder/arm/dequantize_arm.c +++ b/vp9/decoder/arm/vp9_dequantize_arm.c @@ -10,8 +10,8 @@ #include "vpx_ports/config.h" -#include "vp9/decoder/dequantize.h" -#include "vp9/common/blockd.h" +#include "vp9/decoder/vp9_dequantize.h" +#include "vp9/common/vp9_blockd.h" #include "vpx_mem/vpx_mem.h" #if HAVE_ARMV7 diff --git a/vp9/decoder/asm_dec_offsets.c b/vp9/decoder/vp9_asm_dec_offsets.c index 270a4e0bc..ece315ac8 100644 --- a/vp9/decoder/asm_dec_offsets.c +++ b/vp9/decoder/vp9_asm_dec_offsets.c @@ -10,7 +10,7 @@ #include "vpx_ports/asm_offsets.h" -#include "onyxd_int.h" +#include "vp9_onyxd_int.h" BEGIN diff --git a/vp9/decoder/dboolhuff.c b/vp9/decoder/vp9_dboolhuff.c index f1e1cdbe0..dc3878e9d 100644 --- a/vp9/decoder/dboolhuff.c +++ b/vp9/decoder/vp9_dboolhuff.c @@ -9,7 +9,7 @@ */ -#include "dboolhuff.h" +#include "vp9_dboolhuff.h" #include "vpx_ports/mem.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp9/decoder/dboolhuff.h b/vp9/decoder/vp9_dboolhuff.h index d46d81bb4..d46d81bb4 100644 --- a/vp9/decoder/dboolhuff.h +++ b/vp9/decoder/vp9_dboolhuff.h diff --git a/vp9/decoder/decodemv.c b/vp9/decoder/vp9_decodemv.c index 0e5f66b60..f17e526ba 100644 --- a/vp9/decoder/decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -9,17 +9,17 @@ */ -#include "treereader.h" -#include "vp9/common/entropymv.h" -#include "vp9/common/entropymode.h" -#include "onyxd_int.h" -#include "vp9/common/findnearmv.h" - -#include "vp9/common/seg_common.h" -#include "vp9/common/pred_common.h" -#include "vp9/common/entropy.h" -#include "vp9/decoder/decodemv.h" -#include "vp9/common/mvref_common.h" +#include "vp9_treereader.h" +#include "vp9/common/vp9_entropymv.h" +#include "vp9/common/vp9_entropymode.h" +#include "vp9_onyxd_int.h" +#include "vp9/common/vp9_findnearmv.h" + +#include "vp9/common/vp9_seg_common.h" +#include "vp9/common/vp9_pred_common.h" +#include "vp9/common/vp9_entropy.h" +#include "vp9/decoder/vp9_decodemv.h" +#include "vp9/common/vp9_mvref_common.h" #if CONFIG_DEBUG #include <assert.h> #endif diff --git a/vp9/decoder/decodemv.h b/vp9/decoder/vp9_decodemv.h index 8b0406f6d..10ae4f54e 100644 --- a/vp9/decoder/decodemv.h +++ b/vp9/decoder/vp9_decodemv.h @@ -9,7 +9,7 @@ */ -#include "onyxd_int.h" +#include "vp9_onyxd_int.h" void vp9_decode_mb_mode_mv(VP9D_COMP* const pbi, MACROBLOCKD* const xd, diff --git a/vp9/decoder/decodframe.c b/vp9/decoder/vp9_decodframe.c index 625053e48..c08332351 100644 --- a/vp9/decoder/decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -9,28 +9,28 @@ */ -#include "onyxd_int.h" -#include "vp9/common/header.h" -#include "vp9/common/reconintra.h" -#include "vp9/common/reconintra4x4.h" -#include "vp9/common/reconinter.h" -#include "vp9/decoder/decodframe.h" -#include "detokenize.h" -#include "vp9/common/invtrans.h" -#include "vp9/common/alloccommon.h" -#include "vp9/common/entropymode.h" -#include "vp9/common/quant_common.h" +#include "vp9_onyxd_int.h" +#include "vp9/common/vp9_header.h" +#include "vp9/common/vp9_reconintra.h" +#include "vp9/common/vp9_reconintra4x4.h" +#include "vp9/common/vp9_reconinter.h" +#include "vp9/decoder/vp9_decodframe.h" +#include "vp9_detokenize.h" +#include "vp9/common/vp9_invtrans.h" +#include "vp9/common/vp9_alloccommon.h" +#include "vp9/common/vp9_entropymode.h" +#include "vp9/common/vp9_quant_common.h" #include "vpx_scale/vpxscale.h" -#include "vp9/common/setupintrarecon.h" +#include "vp9/common/vp9_setupintrarecon.h" -#include "decodemv.h" -#include "vp9/common/extend.h" -#include "vp9/common/modecont.h" +#include "vp9_decodemv.h" +#include "vp9/common/vp9_extend.h" +#include "vp9/common/vp9_modecont.h" #include "vpx_mem/vpx_mem.h" -#include "dboolhuff.h" +#include "vp9_dboolhuff.h" -#include "vp9/common/seg_common.h" -#include "vp9/common/entropy.h" +#include "vp9/common/vp9_seg_common.h" +#include "vp9/common/vp9_entropy.h" #include "vp9_rtcd.h" #include <assert.h> diff --git a/vp9/decoder/decodframe.h b/vp9/decoder/vp9_decodframe.h index cc480798a..cc480798a 100644 --- a/vp9/decoder/decodframe.h +++ b/vp9/decoder/vp9_decodframe.h diff --git a/vp9/decoder/dequantize.c b/vp9/decoder/vp9_dequantize.c index 37e8e4cee..f3a22b543 100644 --- a/vp9/decoder/dequantize.c +++ b/vp9/decoder/vp9_dequantize.c @@ -10,9 +10,9 @@ #include "vp9_rtcd.h" -#include "dequantize.h" +#include "vp9_dequantize.h" #include "vpx_mem/vpx_mem.h" -#include "onyxd_int.h" +#include "vp9_onyxd_int.h" #ifdef DEC_DEBUG extern int dec_debug; diff --git a/vp9/decoder/dequantize.h b/vp9/decoder/vp9_dequantize.h index 4b90a4d70..0b455200c 100644 --- a/vp9/decoder/dequantize.h +++ b/vp9/decoder/vp9_dequantize.h @@ -11,7 +11,7 @@ #ifndef DEQUANTIZE_H #define DEQUANTIZE_H -#include "vp9/common/blockd.h" +#include "vp9/common/vp9_blockd.h" #if CONFIG_LOSSLESS extern void vp9_dequant_idct_add_lossless_c(short *input, const short *dq, diff --git a/vp9/decoder/detokenize.c b/vp9/decoder/vp9_detokenize.c index b6823e7ef..8c469c403 100644 --- a/vp9/decoder/detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -9,14 +9,14 @@ */ -#include "vp9/common/type_aliases.h" -#include "vp9/common/blockd.h" -#include "onyxd_int.h" +#include "vp9/common/vp9_type_aliases.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9_onyxd_int.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h" -#include "detokenize.h" +#include "vp9_detokenize.h" -#include "vp9/common/seg_common.h" +#include "vp9/common/vp9_seg_common.h" #define EOB_CONTEXT_NODE 0 #define ZERO_CONTEXT_NODE 1 diff --git a/vp9/decoder/detokenize.h b/vp9/decoder/vp9_detokenize.h index 9f00d297d..1425a36e3 100644 --- a/vp9/decoder/detokenize.h +++ b/vp9/decoder/vp9_detokenize.h @@ -12,7 +12,7 @@ #ifndef DETOKENIZE_H #define DETOKENIZE_H -#include "onyxd_int.h" +#include "vp9_onyxd_int.h" void vp9_reset_mb_tokens_context(MACROBLOCKD* const); diff --git a/vp9/decoder/idct_blk.c b/vp9/decoder/vp9_idct_blk.c index 98eb81ca6..f84e30e81 100644 --- a/vp9/decoder/idct_blk.c +++ b/vp9/decoder/vp9_idct_blk.c @@ -9,7 +9,7 @@ */ #include "vp9_rtcd.h" -#include "vp9/common/blockd.h" +#include "vp9/common/vp9_blockd.h" void vp9_dequant_dc_idct_add_y_block_c(short *q, const short *dq, unsigned char *pre, diff --git a/vp9/decoder/onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index 6c20223d3..70671683b 100644 --- a/vp9/decoder/onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -9,25 +9,25 @@ */ -#include "vp9/common/onyxc_int.h" +#include "vp9/common/vp9_onyxc_int.h" #if CONFIG_POSTPROC -#include "vp9/common/postproc.h" +#include "vp9/common/vp9_postproc.h" #endif -#include "vp9/common/onyxd.h" -#include "onyxd_int.h" +#include "vp9/common/vp9_onyxd.h" +#include "vp9_onyxd_int.h" #include "vpx_mem/vpx_mem.h" -#include "vp9/common/alloccommon.h" -#include "vp9/common/loopfilter.h" -#include "vp9/common/swapyv12buffer.h" +#include "vp9/common/vp9_alloccommon.h" +#include "vp9/common/vp9_loopfilter.h" +#include "vp9/common/vp9_swapyv12buffer.h" #include <stdio.h> #include <assert.h> -#include "vp9/common/quant_common.h" +#include "vp9/common/vp9_quant_common.h" #include "vpx_scale/vpxscale.h" -#include "vp9/common/systemdependent.h" +#include "vp9/common/vp9_systemdependent.h" #include "vpx_ports/vpx_timer.h" -#include "vp9/decoder/decodframe.h" -#include "detokenize.h" +#include "vp9/decoder/vp9_decodframe.h" +#include "vp9_detokenize.h" #if ARCH_ARM #include "vpx_ports/arm.h" #endif diff --git a/vp9/decoder/onyxd_int.h b/vp9/decoder/vp9_onyxd_int.h index cbb13ffe8..023e8eefd 100644 --- a/vp9/decoder/onyxd_int.h +++ b/vp9/decoder/vp9_onyxd_int.h @@ -12,10 +12,10 @@ #ifndef __INC_ONYXD_INT_H #define __INC_ONYXD_INT_H #include "vpx_ports/config.h" -#include "vp9/common/onyxd.h" -#include "treereader.h" -#include "vp9/common/onyxc_int.h" -#include "dequantize.h" +#include "vp9/common/vp9_onyxd.h" +#include "vp9_treereader.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9_dequantize.h" // #define DEC_DEBUG diff --git a/vp9/decoder/reconintra_mt.h b/vp9/decoder/vp9_reconintra_mt.h index b04537956..b04537956 100644 --- a/vp9/decoder/reconintra_mt.h +++ b/vp9/decoder/vp9_reconintra_mt.h diff --git a/vp9/decoder/treereader.h b/vp9/decoder/vp9_treereader.h index 931a6405c..4c49c9a75 100644 --- a/vp9/decoder/treereader.h +++ b/vp9/decoder/vp9_treereader.h @@ -12,9 +12,9 @@ #ifndef tree_reader_h #define tree_reader_h 1 -#include "vp9/common/treecoder.h" +#include "vp9/common/vp9_treecoder.h" -#include "dboolhuff.h" +#include "vp9_dboolhuff.h" typedef BOOL_DECODER vp9_reader; diff --git a/vp9/decoder/x86/dequantize_mmx.asm b/vp9/decoder/x86/vp9_dequantize_mmx.asm index 23080bfee..23080bfee 100644 --- a/vp9/decoder/x86/dequantize_mmx.asm +++ b/vp9/decoder/x86/vp9_dequantize_mmx.asm diff --git a/vp9/decoder/x86/idct_blk_mmx.c b/vp9/decoder/x86/vp9_idct_blk_mmx.c index 8445b28f0..2657786ed 100644 --- a/vp9/decoder/x86/idct_blk_mmx.c +++ b/vp9/decoder/x86/vp9_idct_blk_mmx.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "vp9/common/blockd.h" -#include "vp9/decoder/dequantize.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/decoder/vp9_dequantize.h" void vp9_dequant_dc_idct_add_y_block_mmx(short *q, const short *dq, unsigned char *pre, diff --git a/vp9/decoder/x86/idct_blk_sse2.c b/vp9/decoder/x86/vp9_idct_blk_sse2.c index 6e66f5347..6c1fd1439 100644 --- a/vp9/decoder/x86/idct_blk_sse2.c +++ b/vp9/decoder/x86/vp9_idct_blk_sse2.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "vp9/common/blockd.h" -#include "vp9/decoder/dequantize.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/decoder/vp9_dequantize.h" void vp9_idct_dequant_dc_0_2x_sse2(short *q, const short *dq, unsigned char *pre, unsigned char *dst, diff --git a/vp9/decoder/x86/x86_dsystemdependent.c b/vp9/decoder/x86/vp9_x86_dsystemdependent.c index 35d2f9732..d1cc53fce 100644 --- a/vp9/decoder/x86/x86_dsystemdependent.c +++ b/vp9/decoder/x86/vp9_x86_dsystemdependent.c @@ -10,7 +10,7 @@ #include "vpx_ports/config.h" #include "vpx_ports/x86.h" -#include "vp9/decoder/onyxd_int.h" +#include "vp9/decoder/vp9_onyxd_int.h" #if HAVE_MMX void vp9_dequantize_b_impl_mmx(short *sq, short *dq, short *q); diff --git a/vp9/encoder/arm/armv5te/boolhuff_armv5te.asm b/vp9/encoder/arm/armv5te/vp9_boolhuff_armv5te.asm index 94e65ef8d..94e65ef8d 100644 --- a/vp9/encoder/arm/armv5te/boolhuff_armv5te.asm +++ b/vp9/encoder/arm/armv5te/vp9_boolhuff_armv5te.asm diff --git a/vp9/encoder/arm/armv5te/vp8_packtokens_armv5.asm b/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_armv5.asm index 9ccbaa6c1..9ccbaa6c1 100644 --- a/vp9/encoder/arm/armv5te/vp8_packtokens_armv5.asm +++ b/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_armv5.asm diff --git a/vp9/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm b/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_mbrow_armv5.asm index 0938ce1a3..0938ce1a3 100644 --- a/vp9/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm +++ b/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_mbrow_armv5.asm diff --git a/vp9/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm b/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_partitions_armv5.asm index 4611b407d..4611b407d 100644 --- a/vp9/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm +++ b/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_partitions_armv5.asm diff --git a/vp9/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_fast_quantize_b_armv6.asm index bca74391a..bca74391a 100644 --- a/vp9/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_fast_quantize_b_armv6.asm diff --git a/vp9/encoder/arm/armv6/vp8_mse16x16_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_mse16x16_armv6.asm index 8e7283667..8e7283667 100644 --- a/vp9/encoder/arm/armv6/vp8_mse16x16_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_mse16x16_armv6.asm diff --git a/vp9/encoder/arm/armv6/vp8_sad16x16_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_sad16x16_armv6.asm index 1b4f5cf3b..1b4f5cf3b 100644 --- a/vp9/encoder/arm/armv6/vp8_sad16x16_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_sad16x16_armv6.asm diff --git a/vp9/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_short_fdct4x4_armv6.asm index 8034c1db9..8034c1db9 100644 --- a/vp9/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_short_fdct4x4_armv6.asm diff --git a/vp9/encoder/arm/armv6/vp8_subtract_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_subtract_armv6.asm index bb466c4e9..bb466c4e9 100644 --- a/vp9/encoder/arm/armv6/vp8_subtract_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_subtract_armv6.asm diff --git a/vp9/encoder/arm/armv6/vp8_variance16x16_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_variance16x16_armv6.asm index 110db3074..110db3074 100644 --- a/vp9/encoder/arm/armv6/vp8_variance16x16_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_variance16x16_armv6.asm diff --git a/vp9/encoder/arm/armv6/vp8_variance8x8_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_variance8x8_armv6.asm index 101f6838d..101f6838d 100644 --- a/vp9/encoder/arm/armv6/vp8_variance8x8_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_variance8x8_armv6.asm diff --git a/vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_h_armv6.asm index 7a8cafd3b..7a8cafd3b 100644 --- a/vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_h_armv6.asm diff --git a/vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_hv_armv6.asm index 6ad5e90bb..6ad5e90bb 100644 --- a/vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_hv_armv6.asm diff --git a/vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm b/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_v_armv6.asm index 0471d3d67..0471d3d67 100644 --- a/vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm +++ b/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_v_armv6.asm diff --git a/vp9/encoder/arm/armv6/walsh_v6.asm b/vp9/encoder/arm/armv6/vp9_walsh_v6.asm index 5eaf3f25a..5eaf3f25a 100644 --- a/vp9/encoder/arm/armv6/walsh_v6.asm +++ b/vp9/encoder/arm/armv6/vp9_walsh_v6.asm diff --git a/vp9/encoder/arm/neon/fastquantizeb_neon.asm b/vp9/encoder/arm/neon/vp9_fastquantizeb_neon.asm index fa3aff8ac..c68233617 100644 --- a/vp9/encoder/arm/neon/fastquantizeb_neon.asm +++ b/vp9/encoder/arm/neon/vp9_fastquantizeb_neon.asm @@ -246,7 +246,7 @@ zero_output ENDP -; default inverse zigzag table is defined in vp9/common/entropy.c +; default inverse zigzag table is defined in vp9/common/vp9_entropy.c _inv_zig_zag_ DCD inv_zig_zag diff --git a/vp9/encoder/arm/neon/picklpf_arm.c b/vp9/encoder/arm/neon/vp9_picklpf_arm.c index 9357769fe..b427e5ef7 100644 --- a/vp9/encoder/arm/neon/picklpf_arm.c +++ b/vp9/encoder/arm/neon/vp9_picklpf_arm.c @@ -9,12 +9,12 @@ */ -#include "vp9/common/onyxc_int.h" -#include "vp9/encoder/onyx_int.h" -#include "vp9/encoder/quantize.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9/encoder/vp9_onyx_int.h" +#include "vp9/encoder/vp9_quantize.h" #include "vpx_mem/vpx_mem.h" #include "vpx_scale/vpxscale.h" -#include "vp9/common/alloccommon.h" +#include "vp9/common/vp9_alloccommon.h" extern void vp8_memcpy_neon(unsigned char *dst_ptr, unsigned char *src_ptr, int sz); diff --git a/vp9/encoder/arm/neon/sad16_neon.asm b/vp9/encoder/arm/neon/vp9_sad16_neon.asm index d7c590e15..d7c590e15 100644 --- a/vp9/encoder/arm/neon/sad16_neon.asm +++ b/vp9/encoder/arm/neon/vp9_sad16_neon.asm diff --git a/vp9/encoder/arm/neon/sad8_neon.asm b/vp9/encoder/arm/neon/vp9_sad8_neon.asm index 23ba6df93..23ba6df93 100644 --- a/vp9/encoder/arm/neon/sad8_neon.asm +++ b/vp9/encoder/arm/neon/vp9_sad8_neon.asm diff --git a/vp9/encoder/arm/neon/shortfdct_neon.asm b/vp9/encoder/arm/neon/vp9_shortfdct_neon.asm index 09dd011ec..09dd011ec 100644 --- a/vp9/encoder/arm/neon/shortfdct_neon.asm +++ b/vp9/encoder/arm/neon/vp9_shortfdct_neon.asm diff --git a/vp9/encoder/arm/neon/subtract_neon.asm b/vp9/encoder/arm/neon/vp9_subtract_neon.asm index eab14868e..eab14868e 100644 --- a/vp9/encoder/arm/neon/subtract_neon.asm +++ b/vp9/encoder/arm/neon/vp9_subtract_neon.asm diff --git a/vp9/encoder/arm/neon/variance_neon.asm b/vp9/encoder/arm/neon/vp9_variance_neon.asm index 901934c61..901934c61 100644 --- a/vp9/encoder/arm/neon/variance_neon.asm +++ b/vp9/encoder/arm/neon/vp9_variance_neon.asm diff --git a/vp9/encoder/arm/neon/vp8_memcpy_neon.asm b/vp9/encoder/arm/neon/vp9_vp8_memcpy_neon.asm index b0450e523..b0450e523 100644 --- a/vp9/encoder/arm/neon/vp8_memcpy_neon.asm +++ b/vp9/encoder/arm/neon/vp9_vp8_memcpy_neon.asm diff --git a/vp9/encoder/arm/neon/vp8_mse16x16_neon.asm b/vp9/encoder/arm/neon/vp9_vp8_mse16x16_neon.asm index 4d1512d40..4d1512d40 100644 --- a/vp9/encoder/arm/neon/vp8_mse16x16_neon.asm +++ b/vp9/encoder/arm/neon/vp9_vp8_mse16x16_neon.asm diff --git a/vp9/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm b/vp9/encoder/arm/neon/vp9_vp8_shortwalsh4x4_neon.asm index 22266297a..22266297a 100644 --- a/vp9/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm +++ b/vp9/encoder/arm/neon/vp9_vp8_shortwalsh4x4_neon.asm diff --git a/vp9/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm b/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16_neon.asm index 8bb0734d1..8bb0734d1 100644 --- a/vp9/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm +++ b/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16_neon.asm diff --git a/vp9/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm b/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16s_neon.asm index a3faf9a77..a3faf9a77 100644 --- a/vp9/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm +++ b/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16s_neon.asm diff --git a/vp9/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm b/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance8x8_neon.asm index 29975f13e..29975f13e 100644 --- a/vp9/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm +++ b/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance8x8_neon.asm diff --git a/vp9/encoder/arm/arm_csystemdependent.c b/vp9/encoder/arm/vp9_arm_csystemdependent.c index 99129de98..5ad3e8dc8 100644 --- a/vp9/encoder/arm/arm_csystemdependent.c +++ b/vp9/encoder/arm/vp9_arm_csystemdependent.c @@ -11,8 +11,8 @@ #include "vpx_ports/config.h" #include "vpx_ports/arm.h" -#include "vp9/encoder/variance.h" -#include "vp9/encoder/onyx_int.h" +#include "vp9/encoder/vp9_variance.h" +#include "vp9/encoder/vp9_onyx_int.h" extern void (*vp9_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction); extern void vp9_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction); diff --git a/vp9/encoder/arm/boolhuff_arm.c b/vp9/encoder/arm/vp9_boolhuff_arm.c index 49cc6d63b..9ff8e5f56 100644 --- a/vp9/encoder/arm/boolhuff_arm.c +++ b/vp9/encoder/arm/vp9_boolhuff_arm.c @@ -9,8 +9,8 @@ */ -#include "vp9/encoder/boolhuff.h" -#include "vp9/common/blockd.h" +#include "vp9/encoder/vp9_boolhuff.h" +#include "vp9/common/vp9_blockd.h" const unsigned int vp9_prob_cost[256] = { 2047, 2047, 1791, 1641, 1535, 1452, 1385, 1328, 1279, 1235, 1196, 1161, 1129, 1099, 1072, 1046, diff --git a/vp9/encoder/arm/dct_arm.c b/vp9/encoder/arm/vp9_dct_arm.c index 5e20a4723..5e20a4723 100644 --- a/vp9/encoder/arm/dct_arm.c +++ b/vp9/encoder/arm/vp9_dct_arm.c diff --git a/vp9/encoder/arm/dct_arm.h b/vp9/encoder/arm/vp9_dct_arm.h index 83c446e7e..83c446e7e 100644 --- a/vp9/encoder/arm/dct_arm.h +++ b/vp9/encoder/arm/vp9_dct_arm.h diff --git a/vp9/encoder/arm/encodemb_arm.h b/vp9/encoder/arm/vp9_encodemb_arm.h index 80bff79df..80bff79df 100644 --- a/vp9/encoder/arm/encodemb_arm.h +++ b/vp9/encoder/arm/vp9_encodemb_arm.h diff --git a/vp9/encoder/arm/quantize_arm.c b/vp9/encoder/arm/vp9_quantize_arm.c index e8aef4f08..f30087166 100644 --- a/vp9/encoder/arm/quantize_arm.c +++ b/vp9/encoder/arm/vp9_quantize_arm.c @@ -12,14 +12,14 @@ #include <math.h> #include "vpx_mem/vpx_mem.h" -#include "vp9/encoder/quantize.h" -#include "vp9/common/entropy.h" +#include "vp9/encoder/vp9_quantize.h" +#include "vp9/common/vp9_entropy.h" #if HAVE_ARMV7 /* vp8_quantize_mbX functions here differs from corresponding ones in - * quantize.c only by using quantize_b_pair function pointer instead of + * vp9_quantize.c only by using quantize_b_pair function pointer instead of * the regular quantize_b function pointer */ void vp8_quantize_mby_neon(MACROBLOCK *x) { int i; diff --git a/vp9/encoder/arm/quantize_arm.h b/vp9/encoder/arm/vp9_quantize_arm.h index 7d2088d2d..7d2088d2d 100644 --- a/vp9/encoder/arm/quantize_arm.h +++ b/vp9/encoder/arm/vp9_quantize_arm.h diff --git a/vp9/encoder/arm/variance_arm.c b/vp9/encoder/arm/vp9_variance_arm.c index c3da1135d..91c0236e3 100644 --- a/vp9/encoder/arm/variance_arm.c +++ b/vp9/encoder/arm/vp9_variance_arm.c @@ -9,9 +9,9 @@ */ #include "vpx_config.h" -#include "vp9/encoder/variance.h" -#include "vp9/common/filter.h" -#include "vp9/common/arm/bilinearfilter_arm.h" +#include "vp9/encoder/vp9_variance.h" +#include "vp9/common/vp9_filter.h" +#include "vp9/common/arm/vp9_bilinearfilter_arm.h" #define HALFNDX 8 diff --git a/vp9/encoder/arm/variance_arm.h b/vp9/encoder/arm/vp9_variance_arm.h index c2c208a78..c2c208a78 100644 --- a/vp9/encoder/arm/variance_arm.h +++ b/vp9/encoder/arm/vp9_variance_arm.h diff --git a/vp9/encoder/generic/csystemdependent.c b/vp9/encoder/generic/vp9_csystemdependent.c index 411408cad..20f03a783 100644 --- a/vp9/encoder/generic/csystemdependent.c +++ b/vp9/encoder/generic/vp9_csystemdependent.c @@ -10,8 +10,8 @@ #include "vpx_ports/config.h" -#include "vp9/encoder/variance.h" -#include "vp9/encoder/onyx_int.h" +#include "vp9/encoder/vp9_variance.h" +#include "vp9/encoder/vp9_onyx_int.h" void vp9_cmachine_specific_config(VP9_COMP *cpi) { diff --git a/vp9/encoder/ppc/csystemdependent.c b/vp9/encoder/ppc/vp9_csystemdependent.c index f06f43b8d..cc67625e7 100644 --- a/vp9/encoder/ppc/csystemdependent.c +++ b/vp9/encoder/ppc/vp9_csystemdependent.c @@ -9,8 +9,8 @@ */ -#include "vp9/encoder/variance.h" -#include "vp9/encoder/onyx_int.h" +#include "vp9/encoder/vp9_variance.h" +#include "vp9/encoder/vp9_onyx_int.h" SADFunction *vp9_sad16x16; SADFunction *vp9_sad16x8; diff --git a/vp9/encoder/ppc/encodemb_altivec.asm b/vp9/encoder/ppc/vp9_encodemb_altivec.asm index 6e0099ddc..6e0099ddc 100644 --- a/vp9/encoder/ppc/encodemb_altivec.asm +++ b/vp9/encoder/ppc/vp9_encodemb_altivec.asm diff --git a/vp9/encoder/ppc/fdct_altivec.asm b/vp9/encoder/ppc/vp9_fdct_altivec.asm index 935d0cb09..935d0cb09 100644 --- a/vp9/encoder/ppc/fdct_altivec.asm +++ b/vp9/encoder/ppc/vp9_fdct_altivec.asm diff --git a/vp9/encoder/ppc/rdopt_altivec.asm b/vp9/encoder/ppc/vp9_rdopt_altivec.asm index ba4823009..ba4823009 100644 --- a/vp9/encoder/ppc/rdopt_altivec.asm +++ b/vp9/encoder/ppc/vp9_rdopt_altivec.asm diff --git a/vp9/encoder/ppc/sad_altivec.asm b/vp9/encoder/ppc/vp9_sad_altivec.asm index e5f26380f..e5f26380f 100644 --- a/vp9/encoder/ppc/sad_altivec.asm +++ b/vp9/encoder/ppc/vp9_sad_altivec.asm diff --git a/vp9/encoder/ppc/variance_altivec.asm b/vp9/encoder/ppc/vp9_variance_altivec.asm index ad2664143..ad2664143 100644 --- a/vp9/encoder/ppc/variance_altivec.asm +++ b/vp9/encoder/ppc/vp9_variance_altivec.asm diff --git a/vp9/encoder/ppc/variance_subpixel_altivec.asm b/vp9/encoder/ppc/vp9_variance_subpixel_altivec.asm index 26cc76f73..26cc76f73 100644 --- a/vp9/encoder/ppc/variance_subpixel_altivec.asm +++ b/vp9/encoder/ppc/vp9_variance_subpixel_altivec.asm diff --git a/vp9/encoder/asm_enc_offsets.c b/vp9/encoder/vp9_asm_enc_offsets.c index 2be2e4b0b..52b7e9d01 100644 --- a/vp9/encoder/asm_enc_offsets.c +++ b/vp9/encoder/vp9_asm_enc_offsets.c @@ -11,11 +11,11 @@ #include "vpx_ports/asm_offsets.h" #include "vpx_config.h" -#include "block.h" -#include "vp9/common/blockd.h" -#include "onyx_int.h" -#include "treewriter.h" -#include "tokenize.h" +#include "vp9_block.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9_onyx_int.h" +#include "vp9_treewriter.h" +#include "vp9_tokenize.h" BEGIN diff --git a/vp9/encoder/bitstream.c b/vp9/encoder/vp9_bitstream.c index 9be2db004..ae8a7c616 100644 --- a/vp9/encoder/bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -9,27 +9,27 @@ */ -#include "vp9/common/header.h" -#include "encodemv.h" -#include "vp9/common/entropymode.h" -#include "vp9/common/findnearmv.h" -#include "mcomp.h" -#include "vp9/common/systemdependent.h" +#include "vp9/common/vp9_header.h" +#include "vp9_encodemv.h" +#include "vp9/common/vp9_entropymode.h" +#include "vp9/common/vp9_findnearmv.h" +#include "vp9_mcomp.h" +#include "vp9/common/vp9_systemdependent.h" #include <assert.h> #include <stdio.h> #include <limits.h> -#include "vp9/common/pragmas.h" +#include "vp9/common/vp9_pragmas.h" #include "vpx/vpx_encoder.h" #include "vpx_mem/vpx_mem.h" -#include "bitstream.h" -#include "segmentation.h" - -#include "vp9/common/seg_common.h" -#include "vp9/common/pred_common.h" -#include "vp9/common/entropy.h" -#include "vp9/encoder/encodemv.h" -#include "vp9/common/entropymv.h" -#include "vp9/common/mvref_common.h" +#include "vp9_bitstream.h" +#include "vp9_segmentation.h" + +#include "vp9/common/vp9_seg_common.h" +#include "vp9/common/vp9_pred_common.h" +#include "vp9/common/vp9_entropy.h" +#include "vp9/encoder/vp9_encodemv.h" +#include "vp9/common/vp9_entropymv.h" +#include "vp9/common/vp9_mvref_common.h" #if defined(SECTIONBITS_OUTPUT) unsigned __int64 Sectionbits[500]; diff --git a/vp9/encoder/bitstream.h b/vp9/encoder/vp9_bitstream.h index a0ac8b5db..a0ac8b5db 100644 --- a/vp9/encoder/bitstream.h +++ b/vp9/encoder/vp9_bitstream.h diff --git a/vp9/encoder/block.h b/vp9/encoder/vp9_block.h index 9f4d060cc..986807e3c 100644 --- a/vp9/encoder/block.h +++ b/vp9/encoder/vp9_block.h @@ -12,11 +12,11 @@ #ifndef __INC_BLOCK_H #define __INC_BLOCK_H -#include "vp9/common/onyx.h" -#include "vp9/common/entropymv.h" -#include "vp9/common/entropy.h" +#include "vp9/common/vp9_onyx.h" +#include "vp9/common/vp9_entropymv.h" +#include "vp9/common/vp9_entropy.h" #include "vpx_ports/mem.h" -#include "vp9/common/onyxc_int.h" +#include "vp9/common/vp9_onyxc_int.h" // motion search site typedef struct { diff --git a/vp9/encoder/boolhuff.c b/vp9/encoder/vp9_boolhuff.c index 0cb4b68cc..7619dfadf 100644 --- a/vp9/encoder/boolhuff.c +++ b/vp9/encoder/vp9_boolhuff.c @@ -9,7 +9,7 @@ */ -#include "boolhuff.h" +#include "vp9_boolhuff.h" #if defined(SECTIONBITS_OUTPUT) unsigned __int64 Sectionbits[500]; diff --git a/vp9/encoder/boolhuff.h b/vp9/encoder/vp9_boolhuff.h index e5fd0fb94..2fad86b2e 100644 --- a/vp9/encoder/boolhuff.h +++ b/vp9/encoder/vp9_boolhuff.h @@ -11,7 +11,7 @@ /**************************************************************************** * -* Module Title : boolhuff.h +* Module Title : vp9_boolhuff.h * * Description : Bool Coder header file. * diff --git a/vp9/encoder/dct.c b/vp9/encoder/vp9_dct.c index 108bdbeb0..6753f2462 100644 --- a/vp9/encoder/dct.c +++ b/vp9/encoder/vp9_dct.c @@ -12,9 +12,9 @@ #include <assert.h> #include <math.h> #include "vpx_ports/config.h" -#include "vp9/common/systemdependent.h" +#include "vp9/common/vp9_systemdependent.h" -#include "vp9/common/blockd.h" +#include "vp9/common/vp9_blockd.h" // TODO: these transforms can be converted into integer forms to reduce // the complexity diff --git a/vp9/encoder/encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 6ad9eaeed..fe486b192 100644 --- a/vp9/encoder/encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -10,32 +10,32 @@ #include "vpx_ports/config.h" -#include "vp9/encoder/encodeframe.h" -#include "encodemb.h" -#include "encodemv.h" -#include "vp9/common/common.h" -#include "onyx_int.h" -#include "vp9/common/extend.h" -#include "vp9/common/entropymode.h" -#include "vp9/common/quant_common.h" -#include "segmentation.h" -#include "vp9/common/setupintrarecon.h" -#include "vp9/common/reconintra4x4.h" -#include "encodeintra.h" -#include "vp9/common/reconinter.h" -#include "vp9/common/invtrans.h" -#include "rdopt.h" -#include "vp9/common/findnearmv.h" -#include "vp9/common/reconintra.h" -#include "vp9/common/seg_common.h" -#include "vp9/encoder/tokenize.h" +#include "vp9/encoder/vp9_encodeframe.h" +#include "vp9_encodemb.h" +#include "vp9_encodemv.h" +#include "vp9/common/vp9_common.h" +#include "vp9_onyx_int.h" +#include "vp9/common/vp9_extend.h" +#include "vp9/common/vp9_entropymode.h" +#include "vp9/common/vp9_quant_common.h" +#include "vp9_segmentation.h" +#include "vp9/common/vp9_setupintrarecon.h" +#include "vp9/common/vp9_reconintra4x4.h" +#include "vp9_encodeintra.h" +#include "vp9/common/vp9_reconinter.h" +#include "vp9/common/vp9_invtrans.h" +#include "vp9_rdopt.h" +#include "vp9/common/vp9_findnearmv.h" +#include "vp9/common/vp9_reconintra.h" +#include "vp9/common/vp9_seg_common.h" +#include "vp9/encoder/vp9_tokenize.h" #include "vp9_rtcd.h" #include <stdio.h> #include <math.h> #include <limits.h> #include "vpx_ports/vpx_timer.h" -#include "vp9/common/pred_common.h" -#include "vp9/common/mvref_common.h" +#include "vp9/common/vp9_pred_common.h" +#include "vp9/common/vp9_mvref_common.h" #define DBG_PRNT_SEGMAP 0 diff --git a/vp9/encoder/encodeframe.h b/vp9/encoder/vp9_encodeframe.h index 5693d681c..5693d681c 100644 --- a/vp9/encoder/encodeframe.h +++ b/vp9/encoder/vp9_encodeframe.h diff --git a/vp9/encoder/encodeintra.c b/vp9/encoder/vp9_encodeintra.c index 42e5e1873..185b43192 100644 --- a/vp9/encoder/encodeintra.c +++ b/vp9/encoder/vp9_encodeintra.c @@ -10,12 +10,12 @@ #include "vpx_ports/config.h" #include "vp9_rtcd.h" -#include "quantize.h" -#include "vp9/common/reconintra.h" -#include "vp9/common/reconintra4x4.h" -#include "encodemb.h" -#include "vp9/common/invtrans.h" -#include "encodeintra.h" +#include "vp9_quantize.h" +#include "vp9/common/vp9_reconintra.h" +#include "vp9/common/vp9_reconintra4x4.h" +#include "vp9_encodemb.h" +#include "vp9/common/vp9_invtrans.h" +#include "vp9_encodeintra.h" #if CONFIG_RUNTIME_CPU_DETECT #define IF_RTCD(x) (x) diff --git a/vp9/encoder/encodeintra.h b/vp9/encoder/vp9_encodeintra.h index 9326ad657..8d6f41e62 100644 --- a/vp9/encoder/encodeintra.h +++ b/vp9/encoder/vp9_encodeintra.h @@ -11,7 +11,7 @@ #ifndef __ENCODEINTRA_H_ #define __ENCODEINTRA_H_ -#include "onyx_int.h" +#include "vp9_onyx_int.h" int vp9_encode_intra(VP9_COMP *cpi, MACROBLOCK *x, int use_16x16_pred); void vp9_encode_intra16x16mby(MACROBLOCK *x); diff --git a/vp9/encoder/encodemb.c b/vp9/encoder/vp9_encodemb.c index 136a24893..145f75a3f 100644 --- a/vp9/encoder/encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -9,15 +9,15 @@ */ #include "vpx_ports/config.h" -#include "encodemb.h" -#include "vp9/common/reconinter.h" -#include "quantize.h" -#include "tokenize.h" -#include "vp9/common/invtrans.h" -#include "vp9/common/reconintra.h" +#include "vp9_encodemb.h" +#include "vp9/common/vp9_reconinter.h" +#include "vp9_quantize.h" +#include "vp9_tokenize.h" +#include "vp9/common/vp9_invtrans.h" +#include "vp9/common/vp9_reconintra.h" #include "vpx_mem/vpx_mem.h" -#include "rdopt.h" -#include "vp9/common/systemdependent.h" +#include "vp9_rdopt.h" +#include "vp9/common/vp9_systemdependent.h" #include "vp9_rtcd.h" void vp9_subtract_b_c(BLOCK *be, BLOCKD *bd, int pitch) { diff --git a/vp9/encoder/encodemb.h b/vp9/encoder/vp9_encodemb.h index 905dad3c7..38d7c73d4 100644 --- a/vp9/encoder/encodemb.h +++ b/vp9/encoder/vp9_encodemb.h @@ -13,7 +13,7 @@ #define __INC_ENCODEMB_H #include "vpx_ports/config.h" -#include "block.h" +#include "vp9_block.h" typedef struct { MB_PREDICTION_MODE mode; @@ -33,7 +33,7 @@ typedef struct { -#include "onyx_int.h" +#include "vp9_onyx_int.h" struct VP9_ENCODER_RTCD; void vp9_encode_inter16x16(MACROBLOCK *x); diff --git a/vp9/encoder/encodemv.c b/vp9/encoder/vp9_encodemv.c index 8b9c170a1..301fa24b1 100644 --- a/vp9/encoder/encodemv.c +++ b/vp9/encoder/vp9_encodemv.c @@ -9,10 +9,10 @@ */ -#include "vp9/common/common.h" -#include "encodemv.h" -#include "vp9/common/entropymode.h" -#include "vp9/common/systemdependent.h" +#include "vp9/common/vp9_common.h" +#include "vp9_encodemv.h" +#include "vp9/common/vp9_entropymode.h" +#include "vp9/common/vp9_systemdependent.h" #include <math.h> diff --git a/vp9/encoder/encodemv.h b/vp9/encoder/vp9_encodemv.h index 639c44104..f3589c147 100644 --- a/vp9/encoder/encodemv.h +++ b/vp9/encoder/vp9_encodemv.h @@ -12,7 +12,7 @@ #ifndef __INC_ENCODEMV_H #define __INC_ENCODEMV_H -#include "onyx_int.h" +#include "vp9_onyx_int.h" void vp9_write_nmv_probs(VP9_COMP* const, int usehp, vp9_writer* const); void vp9_encode_nmv(vp9_writer* const w, const MV* const mv, diff --git a/vp9/encoder/firstpass.c b/vp9/encoder/vp9_firstpass.c index 3e232efe8..4a8f5ef23 100644 --- a/vp9/encoder/firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -10,27 +10,27 @@ #include "math.h" #include "limits.h" -#include "block.h" -#include "onyx_int.h" -#include "variance.h" -#include "encodeintra.h" -#include "vp9/common/setupintrarecon.h" -#include "mcomp.h" -#include "firstpass.h" +#include "vp9_block.h" +#include "vp9_onyx_int.h" +#include "vp9_variance.h" +#include "vp9_encodeintra.h" +#include "vp9/common/vp9_setupintrarecon.h" +#include "vp9_mcomp.h" +#include "vp9_firstpass.h" #include "vpx_scale/vpxscale.h" -#include "vp9/encoder/encodeframe.h" -#include "encodemb.h" -#include "vp9/common/extend.h" -#include "vp9/common/systemdependent.h" +#include "vp9/encoder/vp9_encodeframe.h" +#include "vp9_encodemb.h" +#include "vp9/common/vp9_extend.h" +#include "vp9/common/vp9_systemdependent.h" #include "vpx_mem/vpx_mem.h" -#include "vp9/common/swapyv12buffer.h" +#include "vp9/common/vp9_swapyv12buffer.h" #include <stdio.h> -#include "vp9/encoder/quantize.h" -#include "rdopt.h" -#include "ratectrl.h" -#include "vp9/common/quant_common.h" -#include "vp9/common/entropymv.h" -#include "encodemv.h" +#include "vp9/encoder/vp9_quantize.h" +#include "vp9_rdopt.h" +#include "vp9_ratectrl.h" +#include "vp9/common/vp9_quant_common.h" +#include "vp9/common/vp9_entropymv.h" +#include "vp9_encodemv.h" #define OUTPUT_FPF 0 diff --git a/vp9/encoder/firstpass.h b/vp9/encoder/vp9_firstpass.h index f90a857f2..f90a857f2 100644 --- a/vp9/encoder/firstpass.h +++ b/vp9/encoder/vp9_firstpass.h diff --git a/vp9/encoder/lookahead.c b/vp9/encoder/vp9_lookahead.c index c10fecd47..ae17656dc 100644 --- a/vp9/encoder/lookahead.c +++ b/vp9/encoder/vp9_lookahead.c @@ -10,8 +10,8 @@ #include <assert.h> #include <stdlib.h> #include "vpx_config.h" -#include "lookahead.h" -#include "vp9/common/extend.h" +#include "vp9_lookahead.h" +#include "vp9/common/vp9_extend.h" #define MAX_LAG_BUFFERS 25 diff --git a/vp9/encoder/lookahead.h b/vp9/encoder/vp9_lookahead.h index 44c31d66d..44c31d66d 100644 --- a/vp9/encoder/lookahead.h +++ b/vp9/encoder/vp9_lookahead.h diff --git a/vp9/encoder/mbgraph.c b/vp9/encoder/vp9_mbgraph.c index 2bcb3b5cf..0a3e24671 100644 --- a/vp9/encoder/mbgraph.c +++ b/vp9/encoder/vp9_mbgraph.c @@ -9,14 +9,14 @@ */ #include <limits.h> -#include <vp9/encoder/encodeintra.h> -#include <vp9/encoder/rdopt.h> -#include <vp9/common/setupintrarecon.h> -#include <vp9/common/blockd.h> -#include <vp9/common/reconinter.h> -#include <vp9/common/systemdependent.h> +#include <vp9/encoder/vp9_encodeintra.h> +#include <vp9/encoder/vp9_rdopt.h> +#include <vp9/common/vp9_setupintrarecon.h> +#include <vp9/common/vp9_blockd.h> +#include <vp9/common/vp9_reconinter.h> +#include <vp9/common/vp9_systemdependent.h> #include <vpx_mem/vpx_mem.h> -#include <vp9/encoder/segmentation.h> +#include <vp9/encoder/vp9_segmentation.h> static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi, int_mv *ref_mv, diff --git a/vp9/encoder/mbgraph.h b/vp9/encoder/vp9_mbgraph.h index 516fe23d2..516fe23d2 100644 --- a/vp9/encoder/mbgraph.h +++ b/vp9/encoder/vp9_mbgraph.h diff --git a/vp9/encoder/mcomp.c b/vp9/encoder/vp9_mcomp.c index a4914d877..b9be68c79 100644 --- a/vp9/encoder/mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -9,14 +9,14 @@ */ -#include "vp9/encoder/onyx_int.h" -#include "mcomp.h" +#include "vp9/encoder/vp9_onyx_int.h" +#include "vp9_mcomp.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/config.h" #include <stdio.h> #include <limits.h> #include <math.h> -#include "vp9/common/findnearmv.h" +#include "vp9/common/vp9_findnearmv.h" #ifdef ENTROPY_STATS static int mv_ref_ct [31] [4] [2]; @@ -2142,10 +2142,10 @@ int vp9_refining_search_sadx4(MACROBLOCK *x, BLOCK *b, BLOCKD *d, #ifdef ENTROPY_STATS void print_mode_context(void) { - FILE *f = fopen("modecont.c", "a"); + FILE *f = fopen("vp9_modecont.c", "a"); int i, j; - fprintf(f, "#include \"entropy.h\"\n"); + fprintf(f, "#include \"vp9_entropy.h\"\n"); fprintf(f, "const int vp9_mode_contexts[6][4] ="); fprintf(f, "{\n"); for (j = 0; j < 6; j++) { diff --git a/vp9/encoder/mcomp.h b/vp9/encoder/vp9_mcomp.h index 924ff21c8..accb47b7b 100644 --- a/vp9/encoder/mcomp.h +++ b/vp9/encoder/vp9_mcomp.h @@ -12,8 +12,8 @@ #ifndef __INC_MCOMP_H #define __INC_MCOMP_H -#include "block.h" -#include "variance.h" +#include "vp9_block.h" +#include "vp9_variance.h" #ifdef ENTROPY_STATS extern void init_mv_ref_counts(); diff --git a/vp9/encoder/modecosts.c b/vp9/encoder/vp9_modecosts.c index d5266c025..5c2eeda84 100644 --- a/vp9/encoder/modecosts.c +++ b/vp9/encoder/vp9_modecosts.c @@ -9,10 +9,10 @@ */ -#include "vp9/common/blockd.h" -#include "onyx_int.h" -#include "treewriter.h" -#include "vp9/common/entropymode.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9_onyx_int.h" +#include "vp9_treewriter.h" +#include "vp9/common/vp9_entropymode.h" void vp9_init_mode_costs(VP9_COMP *c) { diff --git a/vp9/encoder/modecosts.h b/vp9/encoder/vp9_modecosts.h index c37604edc..c37604edc 100644 --- a/vp9/encoder/modecosts.h +++ b/vp9/encoder/vp9_modecosts.h diff --git a/vp9/encoder/onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 7d2a177c3..ec9f14e8a 100644 --- a/vp9/encoder/onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -10,36 +10,36 @@ #include "vpx_config.h" -#include "vp9/common/onyxc_int.h" -#include "onyx_int.h" -#include "vp9/common/systemdependent.h" -#include "quantize.h" -#include "vp9/common/alloccommon.h" -#include "mcomp.h" -#include "firstpass.h" -#include "psnr.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9_onyx_int.h" +#include "vp9/common/vp9_systemdependent.h" +#include "vp9_quantize.h" +#include "vp9/common/vp9_alloccommon.h" +#include "vp9_mcomp.h" +#include "vp9_firstpass.h" +#include "vp9_psnr.h" #include "vpx_scale/vpxscale.h" -#include "vp9/common/extend.h" -#include "ratectrl.h" -#include "vp9/common/quant_common.h" -#include "segmentation.h" +#include "vp9/common/vp9_extend.h" +#include "vp9_ratectrl.h" +#include "vp9/common/vp9_quant_common.h" +#include "vp9_segmentation.h" #include "./vp9_rtcd.h" #if CONFIG_POSTPROC -#include "vp9/common/postproc.h" +#include "vp9/common/vp9_postproc.h" #endif #include "vpx_mem/vpx_mem.h" -#include "vp9/common/swapyv12buffer.h" +#include "vp9/common/vp9_swapyv12buffer.h" #include "vpx_ports/vpx_timer.h" -#include "temporal_filter.h" +#include "vp9_temporal_filter.h" -#include "vp9/common/seg_common.h" -#include "mbgraph.h" -#include "vp9/common/pred_common.h" -#include "vp9/encoder/rdopt.h" -#include "bitstream.h" -#include "vp9/encoder/picklpf.h" -#include "ratectrl.h" -#include "vp9/common/mvref_common.h" +#include "vp9/common/vp9_seg_common.h" +#include "vp9_mbgraph.h" +#include "vp9/common/vp9_pred_common.h" +#include "vp9/encoder/vp9_rdopt.h" +#include "vp9_bitstream.h" +#include "vp9/encoder/vp9_picklpf.h" +#include "vp9_ratectrl.h" +#include "vp9/common/vp9_mvref_common.h" #if ARCH_ARM @@ -2244,9 +2244,9 @@ void vp9_remove_compressor(VP9_PTR *ptr) { #ifdef ENTROPY_STATS { int i, j, k; - FILE *fmode = fopen("modecontext.c", "w"); + FILE *fmode = fopen("vp9_modecontext.c", "w"); - fprintf(fmode, "\n#include \"entropymode.h\"\n\n"); + fprintf(fmode, "\n#include \"vp9_entropymode.h\"\n\n"); fprintf(fmode, "const unsigned int vp9_kf_default_bmode_counts "); fprintf(fmode, "[VP9_KF_BINTRAMODES][VP9_KF_BINTRAMODES]" "[VP9_KF_BINTRAMODES] =\n{\n"); diff --git a/vp9/encoder/onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 696c0e36c..8cb77c352 100644 --- a/vp9/encoder/onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -14,21 +14,21 @@ #include <stdio.h> #include "vpx_ports/config.h" -#include "vp9/common/onyx.h" -#include "treewriter.h" -#include "tokenize.h" -#include "vp9/common/onyxc_int.h" -#include "variance.h" -#include "encodemb.h" -#include "quantize.h" -#include "vp9/common/entropy.h" -#include "vp9/common/entropymode.h" +#include "vp9/common/vp9_onyx.h" +#include "vp9_treewriter.h" +#include "vp9_tokenize.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9_variance.h" +#include "vp9_encodemb.h" +#include "vp9_quantize.h" +#include "vp9/common/vp9_entropy.h" +#include "vp9/common/vp9_entropymode.h" #include "vpx_ports/mem.h" #include "vpx/internal/vpx_codec_internal.h" -#include "mcomp.h" -#include "temporal_filter.h" -#include "vp9/common/findnearmv.h" -#include "lookahead.h" +#include "vp9_mcomp.h" +#include "vp9_temporal_filter.h" +#include "vp9/common/vp9_findnearmv.h" +#include "vp9_lookahead.h" // #define SPEEDSTATS 1 #define MIN_GF_INTERVAL 4 diff --git a/vp9/encoder/picklpf.c b/vp9/encoder/vp9_picklpf.c index d5631bd23..4c971e200 100644 --- a/vp9/encoder/picklpf.c +++ b/vp9/encoder/vp9_picklpf.c @@ -9,14 +9,14 @@ */ -#include "vp9/common/onyxc_int.h" -#include "onyx_int.h" -#include "vp9/encoder/picklpf.h" -#include "quantize.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9_onyx_int.h" +#include "vp9/encoder/vp9_picklpf.h" +#include "vp9_quantize.h" #include "vpx_mem/vpx_mem.h" #include "vpx_scale/vpxscale.h" -#include "vp9/common/alloccommon.h" -#include "vp9/common/loopfilter.h" +#include "vp9/common/vp9_alloccommon.h" +#include "vp9/common/vp9_loopfilter.h" #if ARCH_ARM #include "vpx_ports/arm.h" #endif diff --git a/vp9/encoder/picklpf.h b/vp9/encoder/vp9_picklpf.h index 9c3f442ae..9c3f442ae 100644 --- a/vp9/encoder/picklpf.h +++ b/vp9/encoder/vp9_picklpf.h diff --git a/vp9/encoder/psnr.c b/vp9/encoder/vp9_psnr.c index 6b67bd3b9..eb00f4159 100644 --- a/vp9/encoder/psnr.c +++ b/vp9/encoder/vp9_psnr.c @@ -11,7 +11,7 @@ #include "vpx_scale/yv12config.h" #include "math.h" -#include "vp9/common/systemdependent.h" /* for vp9_clear_system_state() */ +#include "vp9/common/vp9_systemdependent.h" /* for vp9_clear_system_state() */ #define MAX_PSNR 100 diff --git a/vp9/encoder/psnr.h b/vp9/encoder/vp9_psnr.h index c25bea750..c25bea750 100644 --- a/vp9/encoder/psnr.h +++ b/vp9/encoder/vp9_psnr.h diff --git a/vp9/encoder/quantize.c b/vp9/encoder/vp9_quantize.c index 807a55c18..f3c2bcb89 100644 --- a/vp9/encoder/quantize.c +++ b/vp9/encoder/vp9_quantize.c @@ -11,11 +11,11 @@ #include <math.h> #include "vpx_mem/vpx_mem.h" -#include "onyx_int.h" -#include "quantize.h" -#include "vp9/common/quant_common.h" +#include "vp9_onyx_int.h" +#include "vp9_quantize.h" +#include "vp9/common/vp9_quant_common.h" -#include "vp9/common/seg_common.h" +#include "vp9/common/vp9_seg_common.h" #ifdef ENC_DEBUG extern int enc_debug; diff --git a/vp9/encoder/quantize.h b/vp9/encoder/vp9_quantize.h index b7a77613f..a62e7723e 100644 --- a/vp9/encoder/quantize.h +++ b/vp9/encoder/vp9_quantize.h @@ -11,7 +11,7 @@ #ifndef __INC_QUANTIZE_H #define __INC_QUANTIZE_H -#include "block.h" +#include "vp9_block.h" #define prototype_quantize_block(sym) \ void (sym)(BLOCK *b,BLOCKD *d) @@ -23,11 +23,11 @@ void (sym)(MACROBLOCK *x) #if ARCH_X86 || ARCH_X86_64 -#include "x86/quantize_x86.h" +#include "x86/vp9_quantize_x86.h" #endif #if ARCH_ARM -#include "arm/quantize_arm.h" +#include "arm/vp9_quantize_arm.h" #endif #define prototype_quantize_block_type(sym) \ diff --git a/vp9/encoder/ratectrl.c b/vp9/encoder/vp9_ratectrl.c index e4972d215..ab9dc71c8 100644 --- a/vp9/encoder/ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -16,14 +16,14 @@ #include <assert.h> #include "math.h" -#include "vp9/common/alloccommon.h" -#include "vp9/common/common.h" -#include "ratectrl.h" -#include "vp9/common/entropymode.h" +#include "vp9/common/vp9_alloccommon.h" +#include "vp9/common/vp9_common.h" +#include "vp9_ratectrl.h" +#include "vp9/common/vp9_entropymode.h" #include "vpx_mem/vpx_mem.h" -#include "vp9/common/systemdependent.h" -#include "encodemv.h" -#include "vp9/common/quant_common.h" +#include "vp9/common/vp9_systemdependent.h" +#include "vp9_encodemv.h" +#include "vp9/common/vp9_quant_common.h" #define MIN_BPB_FACTOR 0.005 #define MAX_BPB_FACTOR 50 diff --git a/vp9/encoder/ratectrl.h b/vp9/encoder/vp9_ratectrl.h index f5c751ea0..a64b8f927 100644 --- a/vp9/encoder/ratectrl.h +++ b/vp9/encoder/vp9_ratectrl.h @@ -11,7 +11,7 @@ #if !defined __INC_RATECTRL_H -#include "onyx_int.h" +#include "vp9_onyx_int.h" #define FRAME_OVERHEAD_BITS 200 diff --git a/vp9/encoder/rdopt.c b/vp9/encoder/vp9_rdopt.c index 53a87a49b..017bf0377 100644 --- a/vp9/encoder/rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -13,34 +13,34 @@ #include <math.h> #include <limits.h> #include <assert.h> -#include "vp9/common/pragmas.h" - -#include "tokenize.h" -#include "treewriter.h" -#include "onyx_int.h" -#include "modecosts.h" -#include "encodeintra.h" -#include "vp9/common/entropymode.h" -#include "vp9/common/reconinter.h" -#include "vp9/common/reconintra.h" -#include "vp9/common/reconintra4x4.h" -#include "vp9/common/findnearmv.h" -#include "vp9/common/quant_common.h" -#include "encodemb.h" -#include "quantize.h" -#include "variance.h" -#include "mcomp.h" -#include "rdopt.h" -#include "ratectrl.h" +#include "vp9/common/vp9_pragmas.h" + +#include "vp9_tokenize.h" +#include "vp9_treewriter.h" +#include "vp9_onyx_int.h" +#include "vp9_modecosts.h" +#include "vp9_encodeintra.h" +#include "vp9/common/vp9_entropymode.h" +#include "vp9/common/vp9_reconinter.h" +#include "vp9/common/vp9_reconintra.h" +#include "vp9/common/vp9_reconintra4x4.h" +#include "vp9/common/vp9_findnearmv.h" +#include "vp9/common/vp9_quant_common.h" +#include "vp9_encodemb.h" +#include "vp9_quantize.h" +#include "vp9_variance.h" +#include "vp9_mcomp.h" +#include "vp9_rdopt.h" +#include "vp9_ratectrl.h" #include "vpx_mem/vpx_mem.h" -#include "vp9/common/systemdependent.h" -#include "vp9/encoder/encodemv.h" +#include "vp9/common/vp9_systemdependent.h" +#include "vp9/encoder/vp9_encodemv.h" -#include "vp9/common/seg_common.h" -#include "vp9/common/pred_common.h" -#include "vp9/common/entropy.h" +#include "vp9/common/vp9_seg_common.h" +#include "vp9/common/vp9_pred_common.h" +#include "vp9/common/vp9_entropy.h" #include "vp9_rtcd.h" -#include "vp9/common/mvref_common.h" +#include "vp9/common/vp9_mvref_common.h" #if CONFIG_RUNTIME_CPU_DETECT #define IF_RTCD(x) (x) diff --git a/vp9/encoder/rdopt.h b/vp9/encoder/vp9_rdopt.h index 0300303a8..0300303a8 100644 --- a/vp9/encoder/rdopt.h +++ b/vp9/encoder/vp9_rdopt.h diff --git a/vp9/encoder/sad_c.c b/vp9/encoder/vp9_sad_c.c index 0e02fabdf..8e12f16db 100644 --- a/vp9/encoder/sad_c.c +++ b/vp9/encoder/vp9_sad_c.c @@ -10,7 +10,7 @@ #include <stdlib.h> -#include "vp9/common/sadmxn.h" +#include "vp9/common/vp9_sadmxn.h" #include "vpx_ports/config.h" #include "vpx/vpx_integer.h" diff --git a/vp9/encoder/satd_c.c b/vp9/encoder/vp9_satd_c.c index 63944f0e9..63944f0e9 100644 --- a/vp9/encoder/satd_c.c +++ b/vp9/encoder/vp9_satd_c.c diff --git a/vp9/encoder/segmentation.c b/vp9/encoder/vp9_segmentation.c index 501299f1d..a9efff9f8 100644 --- a/vp9/encoder/segmentation.c +++ b/vp9/encoder/vp9_segmentation.c @@ -11,8 +11,8 @@ #include "limits.h" #include "vpx_mem/vpx_mem.h" -#include "segmentation.h" -#include "vp9/common/pred_common.h" +#include "vp9_segmentation.h" +#include "vp9/common/vp9_pred_common.h" void vp9_update_gf_useage_maps(VP9_COMP *cpi, VP9_COMMON *cm, MACROBLOCK *x) { int mb_row, mb_col; diff --git a/vp9/encoder/segmentation.h b/vp9/encoder/vp9_segmentation.h index 8caea4878..3d963f1d5 100644 --- a/vp9/encoder/segmentation.h +++ b/vp9/encoder/vp9_segmentation.h @@ -10,8 +10,8 @@ #include "string.h" -#include "vp9/common/blockd.h" -#include "onyx_int.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9_onyx_int.h" #ifndef __INC_SEGMENTATION_H__ #define __INC_SEGMENTATION_H__ 1 diff --git a/vp9/encoder/ssim.c b/vp9/encoder/vp9_ssim.c index 464dfd341..71ea02e08 100644 --- a/vp9/encoder/ssim.c +++ b/vp9/encoder/vp9_ssim.c @@ -9,7 +9,7 @@ */ -#include "onyx_int.h" +#include "vp9_onyx_int.h" void vp9_ssim_parms_16x16_c(unsigned char *s, int sp, unsigned char *r, int rp, unsigned long *sum_s, unsigned long *sum_r, diff --git a/vp9/encoder/temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c index 90037f92a..c8fc6b7d0 100644 --- a/vp9/encoder/temporal_filter.c +++ b/vp9/encoder/vp9_temporal_filter.c @@ -9,21 +9,21 @@ */ -#include "vp9/common/onyxc_int.h" -#include "onyx_int.h" -#include "vp9/common/systemdependent.h" -#include "quantize.h" -#include "vp9/common/alloccommon.h" -#include "mcomp.h" -#include "firstpass.h" -#include "psnr.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9_onyx_int.h" +#include "vp9/common/vp9_systemdependent.h" +#include "vp9_quantize.h" +#include "vp9/common/vp9_alloccommon.h" +#include "vp9_mcomp.h" +#include "vp9_firstpass.h" +#include "vp9_psnr.h" #include "vpx_scale/vpxscale.h" -#include "vp9/common/extend.h" -#include "ratectrl.h" -#include "vp9/common/quant_common.h" -#include "segmentation.h" +#include "vp9/common/vp9_extend.h" +#include "vp9_ratectrl.h" +#include "vp9/common/vp9_quant_common.h" +#include "vp9_segmentation.h" #include "vpx_mem/vpx_mem.h" -#include "vp9/common/swapyv12buffer.h" +#include "vp9/common/vp9_swapyv12buffer.h" #include "vpx_ports/vpx_timer.h" #include <math.h> diff --git a/vp9/encoder/temporal_filter.h b/vp9/encoder/vp9_temporal_filter.h index 0d9161db1..c22ff2bab 100644 --- a/vp9/encoder/temporal_filter.h +++ b/vp9/encoder/vp9_temporal_filter.h @@ -26,7 +26,7 @@ ) #if ARCH_X86 || ARCH_X86_64 -#include "x86/temporal_filter_x86.h" +#include "x86/vp9_temporal_filter_x86.h" #endif #ifndef vp9_temporal_filter_apply diff --git a/vp9/encoder/tokenize.c b/vp9/encoder/vp9_tokenize.c index bf835b7f2..c08040830 100644 --- a/vp9/encoder/tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -13,16 +13,16 @@ #include <stdio.h> #include <string.h> #include <assert.h> -#include "onyx_int.h" -#include "tokenize.h" +#include "vp9_onyx_int.h" +#include "vp9_tokenize.h" #include "vpx_mem/vpx_mem.h" -#include "vp9/common/pred_common.h" -#include "vp9/common/seg_common.h" -#include "vp9/common/entropy.h" +#include "vp9/common/vp9_pred_common.h" +#include "vp9/common/vp9_seg_common.h" +#include "vp9/common/vp9_entropy.h" /* Global event counters used for accumulating statistics across several - compressions, then generating context.c = initial stats. */ + compressions, then generating vp9_context.c = initial stats. */ #ifdef ENTROPY_STATS INT64 context_counters[BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; @@ -447,9 +447,9 @@ void init_context_counters(void) { void print_context_counters() { int type, band, pt, t; - FILE *f = fopen("context.c", "w"); + FILE *f = fopen("vp9_context.c", "w"); - fprintf(f, "#include \"entropy.h\"\n"); + fprintf(f, "#include \"vp9_entropy.h\"\n"); fprintf(f, "\n/* *** GENERATED FILE: DO NOT EDIT *** */\n\n"); fprintf(f, "static const unsigned int\n" "vp9_default_coef_counts[BLOCK_TYPES]\n" diff --git a/vp9/encoder/tokenize.h b/vp9/encoder/vp9_tokenize.h index 648e8cd4b..e69d8f633 100644 --- a/vp9/encoder/tokenize.h +++ b/vp9/encoder/vp9_tokenize.h @@ -12,8 +12,8 @@ #ifndef tokenize_h #define tokenize_h -#include "vp9/common/entropy.h" -#include "block.h" +#include "vp9/common/vp9_entropy.h" +#include "vp9_block.h" void vp9_tokenize_initialize(); diff --git a/vp9/encoder/treewriter.c b/vp9/encoder/vp9_treewriter.c index 2fb984b49..4bdf473db 100644 --- a/vp9/encoder/treewriter.c +++ b/vp9/encoder/vp9_treewriter.c @@ -9,7 +9,7 @@ */ -#include "treewriter.h" +#include "vp9_treewriter.h" static void cost( int *const C, diff --git a/vp9/encoder/treewriter.h b/vp9/encoder/vp9_treewriter.h index 1e1bf3d6b..d9198afcf 100644 --- a/vp9/encoder/treewriter.h +++ b/vp9/encoder/vp9_treewriter.h @@ -15,9 +15,9 @@ /* Trees map alphabets into huffman-like codes suitable for an arithmetic bit coder. Timothy S Murphy 11 October 2004 */ -#include "vp9/common/treecoder.h" +#include "vp9/common/vp9_treecoder.h" -#include "boolhuff.h" /* for now */ +#include "vp9_boolhuff.h" /* for now */ typedef BOOL_CODER vp9_writer; diff --git a/vp9/encoder/variance.h b/vp9/encoder/vp9_variance.h index b504fbb17..b504fbb17 100644 --- a/vp9/encoder/variance.h +++ b/vp9/encoder/vp9_variance.h diff --git a/vp9/encoder/variance_c.c b/vp9/encoder/vp9_variance_c.c index 7703ef0c2..278c7ebbe 100644 --- a/vp9/encoder/variance_c.c +++ b/vp9/encoder/vp9_variance_c.c @@ -9,9 +9,9 @@ */ -#include "variance.h" -#include "vp9/common/filter.h" -#include "vp9/common/subpelvar.h" +#include "vp9_variance.h" +#include "vp9/common/vp9_filter.h" +#include "vp9/common/vp9_subpelvar.h" #include "vpx/vpx_integer.h" unsigned int vp9_get_mb_ss_c(const short *src_ptr) { diff --git a/vp9/encoder/x86/dct_mmx.asm b/vp9/encoder/x86/vp9_dct_mmx.asm index 3045466f2..3045466f2 100644 --- a/vp9/encoder/x86/dct_mmx.asm +++ b/vp9/encoder/x86/vp9_dct_mmx.asm diff --git a/vp9/encoder/x86/dct_sse2.asm b/vp9/encoder/x86/vp9_dct_sse2.asm index 2821fbe35..2821fbe35 100644 --- a/vp9/encoder/x86/dct_sse2.asm +++ b/vp9/encoder/x86/vp9_dct_sse2.asm diff --git a/vp9/encoder/x86/encodeopt.asm b/vp9/encoder/x86/vp9_encodeopt.asm index 9e4cd1102..9e4cd1102 100644 --- a/vp9/encoder/x86/encodeopt.asm +++ b/vp9/encoder/x86/vp9_encodeopt.asm diff --git a/vp9/encoder/x86/fwalsh_sse2.asm b/vp9/encoder/x86/vp9_fwalsh_sse2.asm index c6b18c1a1..c6b18c1a1 100644 --- a/vp9/encoder/x86/fwalsh_sse2.asm +++ b/vp9/encoder/x86/vp9_fwalsh_sse2.asm diff --git a/vp9/encoder/x86/mcomp_x86.h b/vp9/encoder/x86/vp9_mcomp_x86.h index cde954550..cde954550 100644 --- a/vp9/encoder/x86/mcomp_x86.h +++ b/vp9/encoder/x86/vp9_mcomp_x86.h diff --git a/vp9/encoder/x86/quantize_mmx.asm b/vp9/encoder/x86/vp9_quantize_mmx.asm index 050119a31..050119a31 100644 --- a/vp9/encoder/x86/quantize_mmx.asm +++ b/vp9/encoder/x86/vp9_quantize_mmx.asm diff --git a/vp9/encoder/x86/quantize_sse2.asm b/vp9/encoder/x86/vp9_quantize_sse2.asm index af6aa6b3b..0b3db6caa 100644 --- a/vp9/encoder/x86/quantize_sse2.asm +++ b/vp9/encoder/x86/vp9_quantize_sse2.asm @@ -149,7 +149,7 @@ sym(vp9_regular_quantize_b_sse2): mov rdx, [rsp + zrun_zbin_boost] ; reset to b->zrun_zbin_boost .rq_zigzag_loop_%1: %endmacro -; in vp9_default_zig_zag1d order: see vp9/common/entropy.c +; in vp9_default_zig_zag1d order: see vp9/common/vp9_entropy.c ZIGZAG_LOOP 0 ZIGZAG_LOOP 1 ZIGZAG_LOOP 4 diff --git a/vp9/encoder/x86/quantize_sse4.asm b/vp9/encoder/x86/vp9_quantize_sse4.asm index 4245b947c..98269f120 100644 --- a/vp9/encoder/x86/quantize_sse4.asm +++ b/vp9/encoder/x86/vp9_quantize_sse4.asm @@ -156,7 +156,7 @@ sym(vp9_regular_quantize_b_sse4): mov rdx, rax ; reset to b->zrun_zbin_boost .rq_zigzag_loop_%1: %endmacro -; in vp9_default_zig_zag1d order: see vp9/common/entropy.c +; in vp9_default_zig_zag1d order: see vp9/common/vp9_entropy.c ZIGZAG_LOOP 0, 0, xmm2, xmm6, xmm4 ZIGZAG_LOOP 1, 1, xmm2, xmm6, xmm4 ZIGZAG_LOOP 4, 4, xmm2, xmm6, xmm4 @@ -249,6 +249,6 @@ ZIGZAG_LOOP 15, 7, xmm3, xmm7, xmm8 SECTION_RODATA align 16 -; vp9/common/entropy.c: vp9_default_zig_zag1d +; vp9/common/vp9_entropy.c: vp9_default_zig_zag1d zig_zag1d: db 0, 1, 4, 8, 5, 2, 3, 6, 9, 12, 13, 10, 7, 11, 14, 15 diff --git a/vp9/encoder/x86/quantize_ssse3.asm b/vp9/encoder/x86/vp9_quantize_ssse3.asm index 8c464287a..8c464287a 100644 --- a/vp9/encoder/x86/quantize_ssse3.asm +++ b/vp9/encoder/x86/vp9_quantize_ssse3.asm diff --git a/vp9/encoder/x86/quantize_x86.h b/vp9/encoder/x86/vp9_quantize_x86.h index 6946e7e29..6946e7e29 100644 --- a/vp9/encoder/x86/quantize_x86.h +++ b/vp9/encoder/x86/vp9_quantize_x86.h diff --git a/vp9/encoder/x86/sad_mmx.asm b/vp9/encoder/x86/vp9_sad_mmx.asm index 827c58cbb..827c58cbb 100644 --- a/vp9/encoder/x86/sad_mmx.asm +++ b/vp9/encoder/x86/vp9_sad_mmx.asm diff --git a/vp9/encoder/x86/sad_sse2.asm b/vp9/encoder/x86/vp9_sad_sse2.asm index fe9fc4d55..fe9fc4d55 100644 --- a/vp9/encoder/x86/sad_sse2.asm +++ b/vp9/encoder/x86/vp9_sad_sse2.asm diff --git a/vp9/encoder/x86/sad_sse3.asm b/vp9/encoder/x86/vp9_sad_sse3.asm index e17485e5b..e17485e5b 100644 --- a/vp9/encoder/x86/sad_sse3.asm +++ b/vp9/encoder/x86/vp9_sad_sse3.asm diff --git a/vp9/encoder/x86/sad_sse4.asm b/vp9/encoder/x86/vp9_sad_sse4.asm index 25980d624..25980d624 100644 --- a/vp9/encoder/x86/sad_sse4.asm +++ b/vp9/encoder/x86/vp9_sad_sse4.asm diff --git a/vp9/encoder/x86/sad_ssse3.asm b/vp9/encoder/x86/vp9_sad_ssse3.asm index 5623d8be4..5623d8be4 100644 --- a/vp9/encoder/x86/sad_ssse3.asm +++ b/vp9/encoder/x86/vp9_sad_ssse3.asm diff --git a/vp9/encoder/x86/ssim_opt.asm b/vp9/encoder/x86/vp9_ssim_opt.asm index 905c263a6..905c263a6 100644 --- a/vp9/encoder/x86/ssim_opt.asm +++ b/vp9/encoder/x86/vp9_ssim_opt.asm diff --git a/vp9/encoder/x86/subtract_mmx.asm b/vp9/encoder/x86/vp9_subtract_mmx.asm index 5b0e249ca..5b0e249ca 100644 --- a/vp9/encoder/x86/subtract_mmx.asm +++ b/vp9/encoder/x86/vp9_subtract_mmx.asm diff --git a/vp9/encoder/x86/subtract_sse2.asm b/vp9/encoder/x86/vp9_subtract_sse2.asm index f84ed0697..f84ed0697 100644 --- a/vp9/encoder/x86/subtract_sse2.asm +++ b/vp9/encoder/x86/vp9_subtract_sse2.asm diff --git a/vp9/encoder/x86/temporal_filter_apply_sse2.asm b/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm index 60cc80f15..60cc80f15 100644 --- a/vp9/encoder/x86/temporal_filter_apply_sse2.asm +++ b/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm diff --git a/vp9/encoder/x86/temporal_filter_x86.h b/vp9/encoder/x86/vp9_temporal_filter_x86.h index 8fae2200d..8fae2200d 100644 --- a/vp9/encoder/x86/temporal_filter_x86.h +++ b/vp9/encoder/x86/vp9_temporal_filter_x86.h diff --git a/vp9/encoder/x86/variance_impl_mmx.asm b/vp9/encoder/x86/vp9_variance_impl_mmx.asm index 45c30b089..45c30b089 100644 --- a/vp9/encoder/x86/variance_impl_mmx.asm +++ b/vp9/encoder/x86/vp9_variance_impl_mmx.asm diff --git a/vp9/encoder/x86/variance_impl_sse2.asm b/vp9/encoder/x86/vp9_variance_impl_sse2.asm index 5b20f3b32..5b20f3b32 100644 --- a/vp9/encoder/x86/variance_impl_sse2.asm +++ b/vp9/encoder/x86/vp9_variance_impl_sse2.asm diff --git a/vp9/encoder/x86/variance_impl_ssse3.asm b/vp9/encoder/x86/vp9_variance_impl_ssse3.asm index 30c75a6ae..30c75a6ae 100644 --- a/vp9/encoder/x86/variance_impl_ssse3.asm +++ b/vp9/encoder/x86/vp9_variance_impl_ssse3.asm diff --git a/vp9/encoder/x86/variance_mmx.c b/vp9/encoder/x86/vp9_variance_mmx.c index 3b5f2a1b9..fa69130a1 100644 --- a/vp9/encoder/x86/variance_mmx.c +++ b/vp9/encoder/x86/vp9_variance_mmx.c @@ -9,8 +9,8 @@ */ #include "vpx_config.h" -#include "vp9/encoder/variance.h" -#include "vp9/common/pragmas.h" +#include "vp9/encoder/vp9_variance.h" +#include "vp9/common/vp9_pragmas.h" #include "vpx_ports/mem.h" extern void filter_block1d_h6_mmx diff --git a/vp9/encoder/x86/variance_sse2.c b/vp9/encoder/x86/vp9_variance_sse2.c index 9f897da51..280efcd7a 100644 --- a/vp9/encoder/x86/variance_sse2.c +++ b/vp9/encoder/x86/vp9_variance_sse2.c @@ -9,8 +9,8 @@ */ #include "vpx_config.h" -#include "vp9/encoder/variance.h" -#include "vp9/common/pragmas.h" +#include "vp9/encoder/vp9_variance.h" +#include "vp9/common/vp9_pragmas.h" #include "vpx_ports/mem.h" #define HALFNDX 8 diff --git a/vp9/encoder/x86/variance_ssse3.c b/vp9/encoder/x86/vp9_variance_ssse3.c index 81b06d117..f95a5423c 100644 --- a/vp9/encoder/x86/variance_ssse3.c +++ b/vp9/encoder/x86/vp9_variance_ssse3.c @@ -9,8 +9,8 @@ */ #include "vpx_config.h" -#include "vp9/encoder/variance.h" -#include "vp9/common/pragmas.h" +#include "vp9/encoder/vp9_variance.h" +#include "vp9/common/vp9_pragmas.h" #include "vpx_ports/mem.h" #define HALFNDX 8 diff --git a/vp9/encoder/x86/x86_csystemdependent.c b/vp9/encoder/x86/vp9_x86_csystemdependent.c index 5fc86c101..be3fe96dc 100644 --- a/vp9/encoder/x86/x86_csystemdependent.c +++ b/vp9/encoder/x86/vp9_x86_csystemdependent.c @@ -11,8 +11,8 @@ #include "vpx_ports/config.h" #include "vpx_ports/x86.h" -#include "vp9/encoder/variance.h" -#include "vp9/encoder/onyx_int.h" +#include "vp9/encoder/vp9_variance.h" +#include "vp9/encoder/vp9_onyx_int.h" // TODO(jimbankoski) Consider rewriting the c to take the same values rather // than going through these pointer conversions diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index 7b77231bc..0868be77c 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -9,132 +9,132 @@ ## VP9_COMMON_SRCS-yes += vp9_common.mk -VP9_COMMON_SRCS-yes += common/type_aliases.h -VP9_COMMON_SRCS-yes += common/pragmas.h -VP9_COMMON_SRCS-yes += common/ppflags.h -VP9_COMMON_SRCS-yes += common/onyx.h -VP9_COMMON_SRCS-yes += common/onyxd.h -VP9_COMMON_SRCS-yes += common/alloccommon.c -VP9_COMMON_SRCS-yes += common/asm_com_offsets.c -VP9_COMMON_SRCS-yes += common/blockd.c -VP9_COMMON_SRCS-yes += common/coefupdateprobs.h -VP9_COMMON_SRCS-yes += common/debugmodes.c -VP9_COMMON_SRCS-yes += common/entropy.c -VP9_COMMON_SRCS-yes += common/entropymode.c -VP9_COMMON_SRCS-yes += common/entropymv.c -VP9_COMMON_SRCS-yes += common/extend.c -VP9_COMMON_SRCS-yes += common/filter.c -VP9_COMMON_SRCS-yes += common/filter.h -VP9_COMMON_SRCS-yes += common/findnearmv.c -VP9_COMMON_SRCS-yes += common/generic/systemdependent.c -VP9_COMMON_SRCS-yes += common/idctllm.c -VP9_COMMON_SRCS-yes += common/alloccommon.h -VP9_COMMON_SRCS-yes += common/blockd.h -VP9_COMMON_SRCS-yes += common/common.h -VP9_COMMON_SRCS-yes += common/common_types.h -VP9_COMMON_SRCS-yes += common/entropy.h -VP9_COMMON_SRCS-yes += common/entropymode.h -VP9_COMMON_SRCS-yes += common/entropymv.h -VP9_COMMON_SRCS-yes += common/extend.h -VP9_COMMON_SRCS-yes += common/findnearmv.h -VP9_COMMON_SRCS-yes += common/header.h -VP9_COMMON_SRCS-yes += common/invtrans.h -VP9_COMMON_SRCS-yes += common/loopfilter.h -VP9_COMMON_SRCS-yes += common/modecont.h -VP9_COMMON_SRCS-yes += common/mv.h -VP9_COMMON_SRCS-yes += common/onyxc_int.h -VP9_COMMON_SRCS-yes += common/pred_common.h -VP9_COMMON_SRCS-yes += common/pred_common.c -VP9_COMMON_SRCS-yes += common/quant_common.h -VP9_COMMON_SRCS-yes += common/reconinter.h -VP9_COMMON_SRCS-yes += common/reconintra.h -VP9_COMMON_SRCS-yes += common/reconintra4x4.h -VP9_COMMON_SRCS-yes += common/rtcd.c -VP9_COMMON_SRCS-yes += common/rtcd_defs.sh -VP9_COMMON_SRCS-yes += common/sadmxn.h -VP9_COMMON_SRCS-yes += common/subpelvar.h -VP9_COMMON_SRCS-yes += common/seg_common.h -VP9_COMMON_SRCS-yes += common/seg_common.c -VP9_COMMON_SRCS-yes += common/setupintrarecon.h -VP9_COMMON_SRCS-yes += common/subpixel.h -VP9_COMMON_SRCS-yes += common/swapyv12buffer.h -VP9_COMMON_SRCS-yes += common/systemdependent.h -VP9_COMMON_SRCS-yes += common/treecoder.h -VP9_COMMON_SRCS-yes += common/invtrans.c -VP9_COMMON_SRCS-yes += common/loopfilter.c -VP9_COMMON_SRCS-yes += common/loopfilter_filters.c -VP9_COMMON_SRCS-yes += common/mbpitch.c -VP9_COMMON_SRCS-yes += common/modecont.c -VP9_COMMON_SRCS-yes += common/modecontext.c -VP9_COMMON_SRCS-yes += common/mvref_common.c -VP9_COMMON_SRCS-yes += common/mvref_common.h -VP9_COMMON_SRCS-yes += common/quant_common.c -VP9_COMMON_SRCS-yes += common/recon.c -VP9_COMMON_SRCS-yes += common/reconinter.c -VP9_COMMON_SRCS-yes += common/reconintra.c -VP9_COMMON_SRCS-yes += common/reconintra4x4.c -VP9_COMMON_SRCS-yes += common/setupintrarecon.c -VP9_COMMON_SRCS-yes += common/swapyv12buffer.c -VP9_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/textblit.c -VP9_COMMON_SRCS-yes += common/treecoder.c -VP9_COMMON_SRCS-$(CONFIG_IMPLICIT_SEGMENTATION) += common/implicit_segmentation.c +VP9_COMMON_SRCS-yes += common/vp9_type_aliases.h +VP9_COMMON_SRCS-yes += common/vp9_pragmas.h +VP9_COMMON_SRCS-yes += common/vp9_ppflags.h +VP9_COMMON_SRCS-yes += common/vp9_onyx.h +VP9_COMMON_SRCS-yes += common/vp9_onyxd.h +VP9_COMMON_SRCS-yes += common/vp9_alloccommon.c +VP9_COMMON_SRCS-yes += common/vp9_asm_com_offsets.c +VP9_COMMON_SRCS-yes += common/vp9_blockd.c +VP9_COMMON_SRCS-yes += common/vp9_coefupdateprobs.h +VP9_COMMON_SRCS-yes += common/vp9_debugmodes.c +VP9_COMMON_SRCS-yes += common/vp9_entropy.c +VP9_COMMON_SRCS-yes += common/vp9_entropymode.c +VP9_COMMON_SRCS-yes += common/vp9_entropymv.c +VP9_COMMON_SRCS-yes += common/vp9_extend.c +VP9_COMMON_SRCS-yes += common/vp9_filter.c +VP9_COMMON_SRCS-yes += common/vp9_filter.h +VP9_COMMON_SRCS-yes += common/vp9_findnearmv.c +VP9_COMMON_SRCS-yes += common/generic/vp9_systemdependent.c +VP9_COMMON_SRCS-yes += common/vp9_idctllm.c +VP9_COMMON_SRCS-yes += common/vp9_alloccommon.h +VP9_COMMON_SRCS-yes += common/vp9_blockd.h +VP9_COMMON_SRCS-yes += common/vp9_common.h +VP9_COMMON_SRCS-yes += common/vp9_common_types.h +VP9_COMMON_SRCS-yes += common/vp9_entropy.h +VP9_COMMON_SRCS-yes += common/vp9_entropymode.h +VP9_COMMON_SRCS-yes += common/vp9_entropymv.h +VP9_COMMON_SRCS-yes += common/vp9_extend.h +VP9_COMMON_SRCS-yes += common/vp9_findnearmv.h +VP9_COMMON_SRCS-yes += common/vp9_header.h +VP9_COMMON_SRCS-yes += common/vp9_invtrans.h +VP9_COMMON_SRCS-yes += common/vp9_loopfilter.h +VP9_COMMON_SRCS-yes += common/vp9_modecont.h +VP9_COMMON_SRCS-yes += common/vp9_mv.h +VP9_COMMON_SRCS-yes += common/vp9_onyxc_int.h +VP9_COMMON_SRCS-yes += common/vp9_pred_common.h +VP9_COMMON_SRCS-yes += common/vp9_pred_common.c +VP9_COMMON_SRCS-yes += common/vp9_quant_common.h +VP9_COMMON_SRCS-yes += common/vp9_reconinter.h +VP9_COMMON_SRCS-yes += common/vp9_reconintra.h +VP9_COMMON_SRCS-yes += common/vp9_reconintra4x4.h +VP9_COMMON_SRCS-yes += common/vp9_rtcd.c +VP9_COMMON_SRCS-yes += common/vp9_rtcd_defs.sh +VP9_COMMON_SRCS-yes += common/vp9_sadmxn.h +VP9_COMMON_SRCS-yes += common/vp9_subpelvar.h +VP9_COMMON_SRCS-yes += common/vp9_seg_common.h +VP9_COMMON_SRCS-yes += common/vp9_seg_common.c +VP9_COMMON_SRCS-yes += common/vp9_setupintrarecon.h +VP9_COMMON_SRCS-yes += common/vp9_subpixel.h +VP9_COMMON_SRCS-yes += common/vp9_swapyv12buffer.h +VP9_COMMON_SRCS-yes += common/vp9_systemdependent.h +VP9_COMMON_SRCS-yes += common/vp9_treecoder.h +VP9_COMMON_SRCS-yes += common/vp9_invtrans.c +VP9_COMMON_SRCS-yes += common/vp9_loopfilter.c +VP9_COMMON_SRCS-yes += common/vp9_loopfilter_filters.c +VP9_COMMON_SRCS-yes += common/vp9_mbpitch.c +VP9_COMMON_SRCS-yes += common/vp9_modecont.c +VP9_COMMON_SRCS-yes += common/vp9_modecontext.c +VP9_COMMON_SRCS-yes += common/vp9_mvref_common.c +VP9_COMMON_SRCS-yes += common/vp9_mvref_common.h +VP9_COMMON_SRCS-yes += common/vp9_quant_common.c +VP9_COMMON_SRCS-yes += common/vp9_recon.c +VP9_COMMON_SRCS-yes += common/vp9_reconinter.c +VP9_COMMON_SRCS-yes += common/vp9_reconintra.c +VP9_COMMON_SRCS-yes += common/vp9_reconintra4x4.c +VP9_COMMON_SRCS-yes += common/vp9_setupintrarecon.c +VP9_COMMON_SRCS-yes += common/vp9_swapyv12buffer.c +VP9_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/vp9_textblit.c +VP9_COMMON_SRCS-yes += common/vp9_treecoder.c +VP9_COMMON_SRCS-$(CONFIG_IMPLICIT_SEGMENTATION) += common/vp9_implicit_segmentation.c -VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/idct_x86.h -VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/subpixel_x86.h -VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/loopfilter_x86.h -VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/postproc_x86.h -VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/x86_systemdependent.c -VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp8_asm_stubs.c -VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/loopfilter_x86.c -VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.h -VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.c -VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/idctllm_mmx.asm -VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/iwalsh_mmx.asm -VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/recon_mmx.asm -VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/subpixel_mmx.asm -VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/loopfilter_mmx.asm -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idctllm_sse2.asm -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_sse2.asm -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_wrapper_sse2.c -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/subpixel_sse2.asm -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_sse2.asm -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/iwalsh_sse2.asm -VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_8t_ssse3.asm -VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_ssse3.asm +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_idct_x86.h +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_subpixel_x86.h +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_x86.h +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_postproc_x86.h +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_x86_systemdependent.c +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_vp8_asm_stubs.c +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_x86.c +VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/vp9_postproc.h +VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/vp9_postproc.c +VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_idctllm_mmx.asm +VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_iwalsh_mmx.asm +VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_recon_mmx.asm +VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_subpixel_mmx.asm +VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_loopfilter_mmx.asm +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_idctllm_sse2.asm +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_recon_sse2.asm +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_recon_wrapper_sse2.c +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_subpixel_sse2.asm +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_loopfilter_sse2.asm +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_iwalsh_sse2.asm +VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/vp9_subpixel_8t_ssse3.asm +VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/vp9_subpixel_ssse3.asm ifeq ($(CONFIG_POSTPROC),yes) -VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/postproc_mmx.asm -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm +VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_postproc_mmx.asm +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_postproc_sse2.asm endif # common (c) ifeq ($(CONFIG_CSM),yes) -VP9_COMMON_SRCS-yes += common/maskingmv.c -VP9_COMMON_SRCS-$(HAVE_SSE3) += common/x86/mask_sse3.asm +VP9_COMMON_SRCS-yes += common/vp9_maskingmv.c +VP9_COMMON_SRCS-$(HAVE_SSE3) += common/x86/vp9_mask_sse3.asm endif -VP9_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/filter_sse4.c +VP9_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/vp9_filter_sse4.c ifeq ($(HAVE_SSE4_1),yes) -$(call xform_obj_path_o_d,vp9/common/x86/filter_sse4.c): CFLAGS += -msse4 +$(call xform_obj_path_o_d,vp9/common/x86/vp9_filter_sse4.c): CFLAGS += -msse4 endif -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/filter_sse2.c -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/sadmxn_x86.c +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_filter_sse2.c +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_sadmxn_x86.c ifeq ($(HAVE_SSE2),yes) -$(call xform_obj_path_o_d,vp9/common/x86/filter_sse2.c): CFLAGS += -msse2 -$(call xform_obj_path_o_d,vp9/common/x86/loopfilter_x86.c): CFLAGS += -msse2 -$(call xform_obj_path_o_d,vp9/common/x86/sadmxn_x86.c): CFLAGS += -msse2 +$(call xform_obj_path_o_d,vp9/common/x86/vp9_filter_sse2.c): CFLAGS += -msse2 +$(call xform_obj_path_o_d,vp9/common/x86/vp9_loopfilter_x86.c): CFLAGS += -msse2 +$(call xform_obj_path_o_d,vp9/common/x86/vp9_sadmxn_x86.c): CFLAGS += -msse2 endif -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/arm_systemdependent.c -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.c -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.h -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/filter_arm.c -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/idct_arm.h -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.c -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.h -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/recon_arm.h -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/reconintra_arm.c -VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/subpixel_arm.h +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_arm_systemdependent.c +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_bilinearfilter_arm.c +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_bilinearfilter_arm.h +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_filter_arm.c +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_idct_arm.h +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_loopfilter_arm.c +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_loopfilter_arm.h +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_recon_arm.h +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_reconintra_arm.c +VP9_COMMON_SRCS-$(ARCH_ARM) += common/arm/vp9_subpixel_arm.h # common (armv6) VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/bilinearfilter_v6$(ASM) @@ -176,10 +176,10 @@ VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict16x16_neon$(ASM) VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon16x16mb_neon$(ASM) VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/buildintrapredictorsmby_neon$(ASM) VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/save_neon_reg$(ASM) -VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon_neon.c +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/vp9_recon_neon.c $(eval $(call asm_offsets_template,\ - vp9_asm_com_offsets.asm, $(VP9_PREFIX)common/asm_com_offsets.c)) + vp9_asm_com_offsets.asm, $(VP9_PREFIX)common/vp9_asm_com_offsets.c)) -$(eval $(call rtcd_h_template,vp9_rtcd,vp9/common/rtcd_defs.sh)) +$(eval $(call rtcd_h_template,vp9_rtcd,vp9/common/vp9_rtcd_defs.sh)) diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index ae60ae122..1ef5ff19e 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -12,10 +12,10 @@ #include "vpx/vpx_codec.h" #include "vpx/internal/vpx_codec_internal.h" #include "vpx_version.h" -#include "vp9/encoder/onyx_int.h" +#include "vp9/encoder/vp9_onyx_int.h" #include "vpx/vp8cx.h" -#include "vp9/encoder/firstpass.h" -#include "vp9/common/onyx.h" +#include "vp9/encoder/vp9_firstpass.h" +#include "vp9/common/vp9_onyx.h" #include <stdlib.h> #include <string.h> diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 74321560f..c35ebedb8 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -15,8 +15,8 @@ #include "vpx/vp8dx.h" #include "vpx/internal/vpx_codec_internal.h" #include "vpx_version.h" -#include "common/onyxd.h" -#include "decoder/onyxd_int.h" +#include "common/vp9_onyxd.h" +#include "decoder/vp9_onyxd_int.h" #define VP8_CAP_POSTPROC (CONFIG_POSTPROC ? VPX_CODEC_CAP_POSTPROC : 0) typedef vpx_codec_stream_info_t vp8_stream_info_t; diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index 6e157b0c4..79997d1aa 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -30,91 +30,91 @@ VP9_CX_SRCS-yes += vp9_cx_iface.c #INCLUDES += common #INCLUDES += encoder -VP9_CX_SRCS-yes += encoder/asm_enc_offsets.c -VP9_CX_SRCS-yes += encoder/bitstream.c -VP9_CX_SRCS-yes += encoder/boolhuff.c -VP9_CX_SRCS-yes += encoder/dct.c -VP9_CX_SRCS-yes += encoder/encodeframe.c -VP9_CX_SRCS-yes += encoder/encodeintra.c -VP9_CX_SRCS-yes += encoder/encodemb.c -VP9_CX_SRCS-yes += encoder/encodemv.c -VP9_CX_SRCS-yes += encoder/firstpass.c -VP9_CX_SRCS-yes += encoder/generic/csystemdependent.c -VP9_CX_SRCS-yes += encoder/block.h -VP9_CX_SRCS-yes += encoder/boolhuff.h -VP9_CX_SRCS-yes += encoder/bitstream.h -VP9_CX_SRCS-yes += encoder/encodeintra.h -VP9_CX_SRCS-yes += encoder/encodemb.h -VP9_CX_SRCS-yes += encoder/encodemv.h -VP9_CX_SRCS-yes += encoder/firstpass.h -VP9_CX_SRCS-yes += encoder/lookahead.c -VP9_CX_SRCS-yes += encoder/lookahead.h -VP9_CX_SRCS-yes += encoder/mcomp.h -VP9_CX_SRCS-yes += encoder/modecosts.h -VP9_CX_SRCS-yes += encoder/onyx_int.h -VP9_CX_SRCS-yes += encoder/psnr.h -VP9_CX_SRCS-yes += encoder/quantize.h -VP9_CX_SRCS-yes += encoder/ratectrl.h -VP9_CX_SRCS-yes += encoder/rdopt.h -VP9_CX_SRCS-yes += encoder/tokenize.h -VP9_CX_SRCS-yes += encoder/treewriter.h -VP9_CX_SRCS-yes += encoder/variance.h -VP9_CX_SRCS-yes += encoder/mcomp.c -VP9_CX_SRCS-yes += encoder/modecosts.c -VP9_CX_SRCS-yes += encoder/onyx_if.c -VP9_CX_SRCS-yes += encoder/picklpf.c -VP9_CX_SRCS-yes += encoder/psnr.c -VP9_CX_SRCS-yes += encoder/quantize.c -VP9_CX_SRCS-yes += encoder/ratectrl.c -VP9_CX_SRCS-yes += encoder/rdopt.c -VP9_CX_SRCS-yes += encoder/sad_c.c -VP9_CX_SRCS-yes += encoder/satd_c.c -VP9_CX_SRCS-yes += encoder/segmentation.c -VP9_CX_SRCS-yes += encoder/segmentation.h -VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c -VP9_CX_SRCS-yes += encoder/tokenize.c -VP9_CX_SRCS-yes += encoder/treewriter.c -VP9_CX_SRCS-yes += encoder/variance_c.c +VP9_CX_SRCS-yes += encoder/vp9_asm_enc_offsets.c +VP9_CX_SRCS-yes += encoder/vp9_bitstream.c +VP9_CX_SRCS-yes += encoder/vp9_boolhuff.c +VP9_CX_SRCS-yes += encoder/vp9_dct.c +VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c +VP9_CX_SRCS-yes += encoder/vp9_encodeintra.c +VP9_CX_SRCS-yes += encoder/vp9_encodemb.c +VP9_CX_SRCS-yes += encoder/vp9_encodemv.c +VP9_CX_SRCS-yes += encoder/vp9_firstpass.c +VP9_CX_SRCS-yes += encoder/generic/vp9_csystemdependent.c +VP9_CX_SRCS-yes += encoder/vp9_block.h +VP9_CX_SRCS-yes += encoder/vp9_boolhuff.h +VP9_CX_SRCS-yes += encoder/vp9_bitstream.h +VP9_CX_SRCS-yes += encoder/vp9_encodeintra.h +VP9_CX_SRCS-yes += encoder/vp9_encodemb.h +VP9_CX_SRCS-yes += encoder/vp9_encodemv.h +VP9_CX_SRCS-yes += encoder/vp9_firstpass.h +VP9_CX_SRCS-yes += encoder/vp9_lookahead.c +VP9_CX_SRCS-yes += encoder/vp9_lookahead.h +VP9_CX_SRCS-yes += encoder/vp9_mcomp.h +VP9_CX_SRCS-yes += encoder/vp9_modecosts.h +VP9_CX_SRCS-yes += encoder/vp9_onyx_int.h +VP9_CX_SRCS-yes += encoder/vp9_psnr.h +VP9_CX_SRCS-yes += encoder/vp9_quantize.h +VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h +VP9_CX_SRCS-yes += encoder/vp9_rdopt.h +VP9_CX_SRCS-yes += encoder/vp9_tokenize.h +VP9_CX_SRCS-yes += encoder/vp9_treewriter.h +VP9_CX_SRCS-yes += encoder/vp9_variance.h +VP9_CX_SRCS-yes += encoder/vp9_mcomp.c +VP9_CX_SRCS-yes += encoder/vp9_modecosts.c +VP9_CX_SRCS-yes += encoder/vp9_onyx_if.c +VP9_CX_SRCS-yes += encoder/vp9_picklpf.c +VP9_CX_SRCS-yes += encoder/vp9_psnr.c +VP9_CX_SRCS-yes += encoder/vp9_quantize.c +VP9_CX_SRCS-yes += encoder/vp9_ratectrl.c +VP9_CX_SRCS-yes += encoder/vp9_rdopt.c +VP9_CX_SRCS-yes += encoder/vp9_sad_c.c +VP9_CX_SRCS-yes += encoder/vp9_satd_c.c +VP9_CX_SRCS-yes += encoder/vp9_segmentation.c +VP9_CX_SRCS-yes += encoder/vp9_segmentation.h +VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c +VP9_CX_SRCS-yes += encoder/vp9_tokenize.c +VP9_CX_SRCS-yes += encoder/vp9_treewriter.c +VP9_CX_SRCS-yes += encoder/vp9_variance_c.c ifeq ($(CONFIG_POSTPROC),yes) -VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h -VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c +VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.h +VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.c endif -VP9_CX_SRCS-yes += encoder/temporal_filter.c -VP9_CX_SRCS-yes += encoder/temporal_filter.h -VP9_CX_SRCS-yes += encoder/mbgraph.c -VP9_CX_SRCS-yes += encoder/mbgraph.h +VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.c +VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.h +VP9_CX_SRCS-yes += encoder/vp9_mbgraph.c +VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h -VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/mcomp_x86.h -VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_x86.h -VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/temporal_filter_x86.h -VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/x86_csystemdependent.c -VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_mmx.c -VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_impl_mmx.asm -VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/sad_mmx.asm -VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm -VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_sse2.c -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_impl_sse2.asm -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/sad_sse2.asm -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/subtract_sse2.asm -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm -VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/sad_sse3.asm -VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/sad_ssse3.asm -VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_ssse3.c -VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_impl_ssse3.asm -VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3.asm -VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/sad_sse4.asm -VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.asm -VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm -VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm -VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt.asm +VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_mcomp_x86.h +VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_x86.h +VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_temporal_filter_x86.h +VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_x86_csystemdependent.c +VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_mmx.c +VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_impl_mmx.asm +VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_sad_mmx.asm +VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_dct_mmx.asm +VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_subtract_mmx.asm +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.asm +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_impl_sse2.asm +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_fwalsh_sse2.asm +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_quantize_sse2.asm +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm +VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm +VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm +VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_sad_ssse3.asm +VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_variance_ssse3.c +VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_variance_impl_ssse3.asm +VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3.asm +VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_sad_sse4.asm +VP9_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/vp9_quantize_sse4.asm +VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_mmx.asm +VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm +VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes)) $(eval $(call asm_offsets_template,\ - vp9_asm_enc_offsets.asm, $(VP9_PREFIX)encoder/asm_enc_offsets.c)) + vp9_asm_enc_offsets.asm, $(VP9_PREFIX)encoder/vp9_asm_enc_offsets.c)) diff --git a/vp9/vp9cx_arm.mk b/vp9/vp9cx_arm.mk index 92dece33c..d0108a84e 100644 --- a/vp9/vp9cx_arm.mk +++ b/vp9/vp9cx_arm.mk @@ -13,20 +13,20 @@ #File list for arm # encoder -VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/arm_csystemdependent.c +VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/vp9_arm_csystemdependent.c -VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c -VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.h -VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/encodemb_arm.h -VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c -VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.h -VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c -VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.h +VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/vp9_dct_arm.c +VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/vp9_dct_arm.h +VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/vp9_encodemb_arm.h +VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/vp9_quantize_arm.c +VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/vp9_quantize_arm.h +VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/vp9_variance_arm.c +VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/vp9_variance_arm.h #File list for armv5te # encoder -VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/boolhuff_arm.c -VP9_CX_SRCS_REMOVE-$(HAVE_ARMV5TE) += encoder/boolhuff.c +VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/vp9_boolhuff_arm.c +VP9_CX_SRCS_REMOVE-$(HAVE_ARMV5TE) += encoder/vp9_boolhuff.c VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/boolhuff_armv5te$(ASM) VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_armv5$(ASM) VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_mbrow_armv5$(ASM) @@ -49,7 +49,7 @@ VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/walsh_v6$(ASM) #File list for neon # encoder VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/fastquantizeb_neon$(ASM) -VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/picklpf_arm.c +VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp9_picklpf_arm.c VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad8_neon$(ASM) VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad16_neon$(ASM) VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/shortfdct_neon$(ASM) diff --git a/vp9/vp9dx.mk b/vp9/vp9dx.mk index 75f6bfd6e..54af58d7f 100644 --- a/vp9/vp9dx.mk +++ b/vp9/vp9dx.mk @@ -45,27 +45,27 @@ VP9_DX_SRCS-yes += vp9_dx_iface.c #INCLUDES += common #INCLUDES += decoder -VP9_DX_SRCS-yes += decoder/asm_dec_offsets.c -VP9_DX_SRCS-yes += decoder/dboolhuff.c -VP9_DX_SRCS-yes += decoder/decodemv.c -VP9_DX_SRCS-yes += decoder/decodframe.c -VP9_DX_SRCS-yes += decoder/dequantize.c -VP9_DX_SRCS-yes += decoder/detokenize.c -VP9_DX_SRCS-yes += decoder/dboolhuff.h -VP9_DX_SRCS-yes += decoder/decodemv.h -VP9_DX_SRCS-yes += decoder/dequantize.h -VP9_DX_SRCS-yes += decoder/detokenize.h -VP9_DX_SRCS-yes += decoder/onyxd_int.h -VP9_DX_SRCS-yes += decoder/treereader.h -VP9_DX_SRCS-yes += decoder/onyxd_if.c -VP9_DX_SRCS-yes += decoder/idct_blk.c +VP9_DX_SRCS-yes += decoder/vp9_asm_dec_offsets.c +VP9_DX_SRCS-yes += decoder/vp9_dboolhuff.c +VP9_DX_SRCS-yes += decoder/vp9_decodemv.c +VP9_DX_SRCS-yes += decoder/vp9_decodframe.c +VP9_DX_SRCS-yes += decoder/vp9_dequantize.c +VP9_DX_SRCS-yes += decoder/vp9_detokenize.c +VP9_DX_SRCS-yes += decoder/vp9_dboolhuff.h +VP9_DX_SRCS-yes += decoder/vp9_decodemv.h +VP9_DX_SRCS-yes += decoder/vp9_dequantize.h +VP9_DX_SRCS-yes += decoder/vp9_detokenize.h +VP9_DX_SRCS-yes += decoder/vp9_onyxd_int.h +VP9_DX_SRCS-yes += decoder/vp9_treereader.h +VP9_DX_SRCS-yes += decoder/vp9_onyxd_if.c +VP9_DX_SRCS-yes += decoder/vp9_idct_blk.c VP9_DX_SRCS-yes := $(filter-out $(VP9_DX_SRCS_REMOVE-yes),$(VP9_DX_SRCS-yes)) -VP9_DX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += decoder/x86/x86_dsystemdependent.c -VP9_DX_SRCS-$(HAVE_MMX) += decoder/x86/dequantize_mmx.asm -VP9_DX_SRCS-$(HAVE_MMX) += decoder/x86/idct_blk_mmx.c -VP9_DX_SRCS-$(HAVE_SSE2) += decoder/x86/idct_blk_sse2.c +VP9_DX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += decoder/x86/vp9_x86_dsystemdependent.c +VP9_DX_SRCS-$(HAVE_MMX) += decoder/x86/vp9_dequantize_mmx.asm +VP9_DX_SRCS-$(HAVE_MMX) += decoder/x86/vp9_idct_blk_mmx.c +VP9_DX_SRCS-$(HAVE_SSE2) += decoder/x86/vp9_idct_blk_sse2.c $(eval $(call asm_offsets_template,\ - vp9_asm_dec_offsets.asm, $(VP9_PREFIX)decoder/asm_dec_offsets.c)) + vp9_asm_dec_offsets.asm, $(VP9_PREFIX)decoder/vp9_asm_dec_offsets.c)) diff --git a/vp9/vp9dx_arm.mk b/vp9/vp9dx_arm.mk index 8020c3d61..32ec26afa 100644 --- a/vp9/vp9dx_arm.mk +++ b/vp9/vp9dx_arm.mk @@ -11,13 +11,13 @@ #VP8_DX_SRCS list is modified according to different platforms. -VP8_DX_SRCS-$(ARCH_ARM) += decoder/arm/dequantize_arm.c +VP8_DX_SRCS-$(ARCH_ARM) += decoder/arm/vp9_dequantize_arm.c #File list for armv6 VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequant_dc_idct_v6$(ASM) VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequant_idct_v6$(ASM) VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequantize_v6$(ASM) -VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/idct_blk_v6.c +VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/vp9_idct_blk_v6.c #File list for neon VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/idct_dequant_dc_full_2x_neon$(ASM) @@ -26,4 +26,4 @@ VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/dequant_idct_neon$(ASM) VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/idct_dequant_full_2x_neon$(ASM) VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/idct_dequant_0_2x_neon$(ASM) VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/dequantizeb_neon$(ASM) -VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/idct_blk_neon.c +VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/vp9_idct_blk_neon.c |