From 4b2c2b9aa4a273a23d90ddb3bbf6dfb3482e0b8f Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 1 Nov 2012 11:09:58 -0700 Subject: [PATCH] Rename vp8/ codec directory to vp9/. Change-Id: Ic084c475844b24092a433ab88138cf58af3abbe4 --- build/x86-msvs/obj_int_extract.bat | 6 +- configure | 10 +- docs.mk | 2 +- example_xma.c | 6 +- examples.mk | 14 +- examples/decoder_tmpl.txt | 2 +- examples/encoder_tmpl.txt | 2 +- examples/postproc.txt | 2 +- libs.mk | 64 +++---- test/boolcoder_test.cc | 4 +- test/dct16x16_test.cc | 6 +- test/fdct4x4_test.cc | 4 +- test/fdct8x8_test.cc | 4 +- test/idct8x8_test.cc | 4 +- vp8/vp8_common.mk | 179 ------------------ vp8/vp8cx.mk | 120 ------------ vp8/vp8cx_arm.mk | 63 ------ vp8/vp8dx.mk | 71 ------- {vp8 => vp9}/common/alloccommon.c | 0 {vp8 => vp9}/common/alloccommon.h | 0 {vp8 => vp9}/common/arm/arm_systemdependent.c | 12 +- .../common/arm/armv6/bilinearfilter_v6.asm | 0 .../common/arm/armv6/copymem16x16_v6.asm | 0 .../common/arm/armv6/copymem8x4_v6.asm | 0 .../common/arm/armv6/copymem8x8_v6.asm | 0 .../common/arm/armv6/dc_only_idct_add_v6.asm | 0 {vp8 => vp9}/common/arm/armv6/filter_v6.asm | 0 {vp8 => vp9}/common/arm/armv6/idct_v6.asm | 0 {vp8 => vp9}/common/arm/armv6/iwalsh_v6.asm | 0 .../common/arm/armv6/loopfilter_v6.asm | 0 {vp8 => vp9}/common/arm/armv6/recon_v6.asm | 0 .../common/arm/armv6/simpleloopfilter_v6.asm | 0 .../common/arm/armv6/sixtappredict8x4_v6.asm | 0 {vp8 => vp9}/common/arm/bilinearfilter_arm.c | 4 +- {vp8 => vp9}/common/arm/bilinearfilter_arm.h | 0 {vp8 => vp9}/common/arm/filter_arm.c | 4 +- {vp8 => vp9}/common/arm/idct_arm.h | 0 {vp8 => vp9}/common/arm/loopfilter_arm.c | 4 +- {vp8 => vp9}/common/arm/loopfilter_arm.h | 0 .../arm/neon/bilinearpredict16x16_neon.asm | 0 .../arm/neon/bilinearpredict4x4_neon.asm | 0 .../arm/neon/bilinearpredict8x4_neon.asm | 0 .../arm/neon/bilinearpredict8x8_neon.asm | 0 .../arm/neon/buildintrapredictorsmby_neon.asm | 0 .../common/arm/neon/copymem16x16_neon.asm | 0 .../common/arm/neon/copymem8x4_neon.asm | 0 .../common/arm/neon/copymem8x8_neon.asm | 0 .../common/arm/neon/dc_only_idct_add_neon.asm | 0 {vp8 => vp9}/common/arm/neon/iwalsh_neon.asm | 0 .../common/arm/neon/loopfilter_neon.asm | 0 .../loopfiltersimplehorizontaledge_neon.asm | 0 .../loopfiltersimpleverticaledge_neon.asm | 0 .../common/arm/neon/mbloopfilter_neon.asm | 0 .../common/arm/neon/recon16x16mb_neon.asm | 0 {vp8 => vp9}/common/arm/neon/recon2b_neon.asm | 0 {vp8 => vp9}/common/arm/neon/recon4b_neon.asm | 0 {vp8 => vp9}/common/arm/neon/recon_neon.c | 4 +- {vp8 => vp9}/common/arm/neon/reconb_neon.asm | 0 .../common/arm/neon/save_neon_reg.asm | 0 .../arm/neon/shortidct4x4llm_1_neon.asm | 0 .../common/arm/neon/shortidct4x4llm_neon.asm | 0 .../arm/neon/sixtappredict16x16_neon.asm | 0 .../common/arm/neon/sixtappredict4x4_neon.asm | 0 .../common/arm/neon/sixtappredict8x4_neon.asm | 0 .../common/arm/neon/sixtappredict8x8_neon.asm | 0 {vp8 => vp9}/common/arm/recon_arm.h | 0 {vp8 => vp9}/common/arm/reconintra_arm.c | 6 +- {vp8 => vp9}/common/arm/subpixel_arm.h | 0 {vp8 => vp9}/common/asm_com_offsets.c | 0 {vp8 => vp9}/common/blockd.c | 0 {vp8 => vp9}/common/blockd.h | 0 {vp8 => vp9}/common/coefupdateprobs.h | 0 {vp8 => vp9}/common/common.h | 0 {vp8 => vp9}/common/common_types.h | 0 {vp8 => vp9}/common/context.c | 0 {vp8 => vp9}/common/debugmodes.c | 0 {vp8 => vp9}/common/default_coef_probs.h | 0 {vp8 => vp9}/common/entropy.c | 0 {vp8 => vp9}/common/entropy.h | 0 {vp8 => vp9}/common/entropymode.c | 2 +- {vp8 => vp9}/common/entropymode.h | 0 {vp8 => vp9}/common/entropymv.c | 0 {vp8 => vp9}/common/entropymv.h | 0 {vp8 => vp9}/common/extend.c | 0 {vp8 => vp9}/common/extend.h | 0 {vp8 => vp9}/common/filter.c | 0 {vp8 => vp9}/common/filter.h | 0 {vp8 => vp9}/common/findnearmv.c | 2 +- {vp8 => vp9}/common/findnearmv.h | 0 {vp8 => vp9}/common/generic/systemdependent.c | 10 +- {vp8 => vp9}/common/header.h | 0 {vp8 => vp9}/common/idct.h | 2 +- {vp8 => vp9}/common/idctllm.c | 6 +- {vp8 => vp9}/common/implicit_segmentation.c | 2 +- {vp8 => vp9}/common/invtrans.c | 0 {vp8 => vp9}/common/invtrans.h | 0 {vp8 => vp9}/common/loopfilter.c | 2 +- {vp8 => vp9}/common/loopfilter.h | 0 {vp8 => vp9}/common/loopfilter_filters.c | 0 {vp8 => vp9}/common/maskingmv.c | 0 {vp8 => vp9}/common/mbpitch.c | 0 {vp8 => vp9}/common/modecont.c | 0 {vp8 => vp9}/common/modecont.h | 0 {vp8 => vp9}/common/modecontext.c | 0 {vp8 => vp9}/common/mv.h | 0 {vp8 => vp9}/common/mvref_common.c | 0 {vp8 => vp9}/common/mvref_common.h | 0 {vp8 => vp9}/common/onyx.h | 0 {vp8 => vp9}/common/onyxc_int.h | 0 {vp8 => vp9}/common/onyxd.h | 0 {vp8 => vp9}/common/postproc.c | 0 {vp8 => vp9}/common/postproc.h | 0 {vp8 => vp9}/common/ppc/copy_altivec.asm | 0 {vp8 => vp9}/common/ppc/filter_altivec.asm | 0 .../common/ppc/filter_bilinear_altivec.asm | 0 {vp8 => vp9}/common/ppc/idctllm_altivec.asm | 0 {vp8 => vp9}/common/ppc/loopfilter_altivec.c | 0 .../common/ppc/loopfilter_filters_altivec.asm | 0 {vp8 => vp9}/common/ppc/platform_altivec.asm | 0 {vp8 => vp9}/common/ppc/recon_altivec.asm | 0 {vp8 => vp9}/common/ppc/systemdependent.c | 0 {vp8 => vp9}/common/ppflags.h | 0 {vp8 => vp9}/common/pragmas.h | 0 {vp8 => vp9}/common/pred_common.c | 4 +- {vp8 => vp9}/common/pred_common.h | 2 +- {vp8 => vp9}/common/quant_common.c | 0 {vp8 => vp9}/common/quant_common.h | 0 {vp8 => vp9}/common/recon.c | 0 {vp8 => vp9}/common/reconinter.c | 0 {vp8 => vp9}/common/reconinter.h | 0 {vp8 => vp9}/common/reconintra.c | 0 {vp8 => vp9}/common/reconintra.h | 0 {vp8 => vp9}/common/reconintra4x4.c | 0 {vp8 => vp9}/common/reconintra4x4.h | 0 {vp8 => vp9}/common/rtcd.c | 0 {vp8 => vp9}/common/rtcd_defs.sh | 2 +- {vp8 => vp9}/common/sadmxn.h | 0 {vp8 => vp9}/common/seg_common.c | 2 +- {vp8 => vp9}/common/seg_common.h | 2 +- {vp8 => vp9}/common/setupintrarecon.c | 0 {vp8 => vp9}/common/setupintrarecon.h | 0 {vp8 => vp9}/common/subpixel.h | 0 {vp8 => vp9}/common/swapyv12buffer.c | 0 {vp8 => vp9}/common/swapyv12buffer.h | 0 {vp8 => vp9}/common/systemdependent.h | 0 {vp8 => vp9}/common/tapify.py | 0 {vp8 => vp9}/common/textblit.c | 0 {vp8 => vp9}/common/treecoder.c | 0 {vp8 => vp9}/common/treecoder.h | 0 {vp8 => vp9}/common/type_aliases.h | 0 {vp8 => vp9}/common/x86/filter_sse2.c | 2 +- {vp8 => vp9}/common/x86/filter_sse4.c | 2 +- {vp8 => vp9}/common/x86/idct_x86.h | 0 {vp8 => vp9}/common/x86/idctllm_mmx.asm | 0 {vp8 => vp9}/common/x86/idctllm_sse2.asm | 0 {vp8 => vp9}/common/x86/iwalsh_mmx.asm | 0 {vp8 => vp9}/common/x86/iwalsh_sse2.asm | 0 {vp8 => vp9}/common/x86/loopfilter_mmx.asm | 0 {vp8 => vp9}/common/x86/loopfilter_sse2.asm | 0 {vp8 => vp9}/common/x86/loopfilter_x86.c | 2 +- {vp8 => vp9}/common/x86/loopfilter_x86.h | 0 {vp8 => vp9}/common/x86/mask_sse3.asm | 0 {vp8 => vp9}/common/x86/postproc_mmx.asm | 0 {vp8 => vp9}/common/x86/postproc_sse2.asm | 0 {vp8 => vp9}/common/x86/postproc_x86.h | 0 {vp8 => vp9}/common/x86/recon_mmx.asm | 0 {vp8 => vp9}/common/x86/recon_sse2.asm | 0 {vp8 => vp9}/common/x86/recon_wrapper_sse2.c | 2 +- {vp8 => vp9}/common/x86/sadmxn_x86.c | 0 {vp8 => vp9}/common/x86/subpixel_8t_ssse3.asm | 0 {vp8 => vp9}/common/x86/subpixel_mmx.asm | 0 {vp8 => vp9}/common/x86/subpixel_sse2.asm | 0 {vp8 => vp9}/common/x86/subpixel_ssse3.asm | 0 {vp8 => vp9}/common/x86/subpixel_x86.h | 0 {vp8 => vp9}/common/x86/vp8_asm_stubs.c | 2 +- {vp8 => vp9}/common/x86/x86_systemdependent.c | 10 +- .../decoder/arm/armv6/dequant_dc_idct_v6.asm | 0 .../decoder/arm/armv6/dequant_idct_v6.asm | 0 .../decoder/arm/armv6/dequantize_v6.asm | 0 {vp8 => vp9}/decoder/arm/armv6/idct_blk_v6.c | 4 +- {vp8 => vp9}/decoder/arm/dequantize_arm.c | 4 +- .../decoder/arm/neon/dequant_idct_neon.asm | 0 .../decoder/arm/neon/dequantizeb_neon.asm | 0 {vp8 => vp9}/decoder/arm/neon/idct_blk_neon.c | 4 +- .../arm/neon/idct_dequant_0_2x_neon.asm | 0 .../arm/neon/idct_dequant_dc_0_2x_neon.asm | 0 .../arm/neon/idct_dequant_dc_full_2x_neon.asm | 0 .../arm/neon/idct_dequant_full_2x_neon.asm | 0 {vp8 => vp9}/decoder/asm_dec_offsets.c | 0 {vp8 => vp9}/decoder/dboolhuff.c | 0 {vp8 => vp9}/decoder/dboolhuff.h | 0 {vp8 => vp9}/decoder/decodemv.c | 14 +- {vp8 => vp9}/decoder/decodemv.h | 0 {vp8 => vp9}/decoder/decodframe.c | 28 +-- {vp8 => vp9}/decoder/dequantize.c | 2 +- {vp8 => vp9}/decoder/dequantize.h | 2 +- {vp8 => vp9}/decoder/detokenize.c | 6 +- {vp8 => vp9}/decoder/detokenize.h | 0 {vp8 => vp9}/decoder/idct_blk.c | 2 +- {vp8 => vp9}/decoder/onyxd_if.c | 16 +- {vp8 => vp9}/decoder/onyxd_int.h | 4 +- {vp8 => vp9}/decoder/reconintra_mt.h | 0 {vp8 => vp9}/decoder/treereader.h | 2 +- {vp8 => vp9}/decoder/x86/dequantize_mmx.asm | 0 {vp8 => vp9}/decoder/x86/idct_blk_mmx.c | 4 +- {vp8 => vp9}/decoder/x86/idct_blk_sse2.c | 4 +- .../decoder/x86/x86_dsystemdependent.c | 2 +- .../encoder/arm/arm_csystemdependent.c | 4 +- .../encoder/arm/armv5te/boolhuff_armv5te.asm | 0 .../arm/armv5te/vp8_packtokens_armv5.asm | 0 .../armv5te/vp8_packtokens_mbrow_armv5.asm | 0 .../vp8_packtokens_partitions_armv5.asm | 0 .../arm/armv6/vp8_fast_quantize_b_armv6.asm | 0 .../encoder/arm/armv6/vp8_mse16x16_armv6.asm | 0 .../encoder/arm/armv6/vp8_sad16x16_armv6.asm | 0 .../arm/armv6/vp8_short_fdct4x4_armv6.asm | 0 .../encoder/arm/armv6/vp8_subtract_armv6.asm | 0 .../arm/armv6/vp8_variance16x16_armv6.asm | 0 .../arm/armv6/vp8_variance8x8_armv6.asm | 0 .../vp8_variance_halfpixvar16x16_h_armv6.asm | 0 .../vp8_variance_halfpixvar16x16_hv_armv6.asm | 0 .../vp8_variance_halfpixvar16x16_v_armv6.asm | 0 {vp8 => vp9}/encoder/arm/armv6/walsh_v6.asm | 0 {vp8 => vp9}/encoder/arm/boolhuff_arm.c | 4 +- {vp8 => vp9}/encoder/arm/dct_arm.c | 0 {vp8 => vp9}/encoder/arm/dct_arm.h | 0 {vp8 => vp9}/encoder/arm/encodemb_arm.h | 0 .../encoder/arm/neon/fastquantizeb_neon.asm | 2 +- {vp8 => vp9}/encoder/arm/neon/picklpf_arm.c | 8 +- {vp8 => vp9}/encoder/arm/neon/sad16_neon.asm | 0 {vp8 => vp9}/encoder/arm/neon/sad8_neon.asm | 0 .../encoder/arm/neon/shortfdct_neon.asm | 0 .../encoder/arm/neon/subtract_neon.asm | 0 .../encoder/arm/neon/variance_neon.asm | 0 .../encoder/arm/neon/vp8_memcpy_neon.asm | 0 .../encoder/arm/neon/vp8_mse16x16_neon.asm | 0 .../arm/neon/vp8_shortwalsh4x4_neon.asm | 0 .../neon/vp8_subpixelvariance16x16_neon.asm | 0 .../neon/vp8_subpixelvariance16x16s_neon.asm | 0 .../arm/neon/vp8_subpixelvariance8x8_neon.asm | 0 {vp8 => vp9}/encoder/arm/quantize_arm.c | 4 +- {vp8 => vp9}/encoder/arm/quantize_arm.h | 0 {vp8 => vp9}/encoder/arm/variance_arm.c | 6 +- {vp8 => vp9}/encoder/arm/variance_arm.h | 0 {vp8 => vp9}/encoder/asm_enc_offsets.c | 2 +- {vp8 => vp9}/encoder/bitstream.c | 22 +-- {vp8 => vp9}/encoder/bitstream.h | 0 {vp8 => vp9}/encoder/block.h | 8 +- {vp8 => vp9}/encoder/boolhuff.c | 0 {vp8 => vp9}/encoder/boolhuff.h | 0 {vp8 => vp9}/encoder/dct.c | 6 +- {vp8 => vp9}/encoder/encodeframe.c | 28 +-- {vp8 => vp9}/encoder/encodeintra.c | 8 +- {vp8 => vp9}/encoder/encodeintra.h | 0 {vp8 => vp9}/encoder/encodemb.c | 8 +- {vp8 => vp9}/encoder/encodemb.h | 0 {vp8 => vp9}/encoder/encodemv.c | 6 +- {vp8 => vp9}/encoder/encodemv.h | 0 {vp8 => vp9}/encoder/firstpass.c | 12 +- {vp8 => vp9}/encoder/firstpass.h | 0 .../encoder/generic/csystemdependent.c | 4 +- {vp8 => vp9}/encoder/lookahead.c | 2 +- {vp8 => vp9}/encoder/lookahead.h | 0 {vp8 => vp9}/encoder/mbgraph.c | 14 +- {vp8 => vp9}/encoder/mbgraph.h | 0 {vp8 => vp9}/encoder/mcomp.c | 4 +- {vp8 => vp9}/encoder/mcomp.h | 0 {vp8 => vp9}/encoder/modecosts.c | 4 +- {vp8 => vp9}/encoder/modecosts.h | 0 {vp8 => vp9}/encoder/onyx_if.c | 22 +-- {vp8 => vp9}/encoder/onyx_int.h | 10 +- {vp8 => vp9}/encoder/picklpf.c | 6 +- {vp8 => vp9}/encoder/ppc/csystemdependent.c | 4 +- {vp8 => vp9}/encoder/ppc/encodemb_altivec.asm | 0 {vp8 => vp9}/encoder/ppc/fdct_altivec.asm | 0 {vp8 => vp9}/encoder/ppc/rdopt_altivec.asm | 0 {vp8 => vp9}/encoder/ppc/sad_altivec.asm | 0 {vp8 => vp9}/encoder/ppc/variance_altivec.asm | 0 .../encoder/ppc/variance_subpixel_altivec.asm | 0 {vp8 => vp9}/encoder/psnr.c | 2 +- {vp8 => vp9}/encoder/psnr.h | 0 {vp8 => vp9}/encoder/quantize.c | 4 +- {vp8 => vp9}/encoder/quantize.h | 0 {vp8 => vp9}/encoder/ratectrl.c | 10 +- {vp8 => vp9}/encoder/ratectrl.h | 0 {vp8 => vp9}/encoder/rdopt.c | 28 +-- {vp8 => vp9}/encoder/rdopt.h | 0 {vp8 => vp9}/encoder/sad_c.c | 2 +- {vp8 => vp9}/encoder/satd_c.c | 0 {vp8 => vp9}/encoder/segmentation.c | 2 +- {vp8 => vp9}/encoder/segmentation.h | 2 +- {vp8 => vp9}/encoder/ssim.c | 0 {vp8 => vp9}/encoder/temporal_filter.c | 12 +- {vp8 => vp9}/encoder/temporal_filter.h | 0 {vp8 => vp9}/encoder/tokenize.c | 6 +- {vp8 => vp9}/encoder/tokenize.h | 2 +- {vp8 => vp9}/encoder/treewriter.c | 0 {vp8 => vp9}/encoder/treewriter.h | 2 +- {vp8 => vp9}/encoder/variance.h | 0 {vp8 => vp9}/encoder/variance_c.c | 2 +- {vp8 => vp9}/encoder/x86/dct_mmx.asm | 0 {vp8 => vp9}/encoder/x86/dct_sse2.asm | 0 {vp8 => vp9}/encoder/x86/encodeopt.asm | 0 {vp8 => vp9}/encoder/x86/fwalsh_sse2.asm | 0 {vp8 => vp9}/encoder/x86/mcomp_x86.h | 0 {vp8 => vp9}/encoder/x86/quantize_mmx.asm | 0 {vp8 => vp9}/encoder/x86/quantize_sse2.asm | 2 +- {vp8 => vp9}/encoder/x86/quantize_sse4.asm | 4 +- {vp8 => vp9}/encoder/x86/quantize_ssse3.asm | 0 {vp8 => vp9}/encoder/x86/quantize_x86.h | 0 {vp8 => vp9}/encoder/x86/sad_mmx.asm | 0 {vp8 => vp9}/encoder/x86/sad_sse2.asm | 0 {vp8 => vp9}/encoder/x86/sad_sse3.asm | 0 {vp8 => vp9}/encoder/x86/sad_sse4.asm | 0 {vp8 => vp9}/encoder/x86/sad_ssse3.asm | 0 {vp8 => vp9}/encoder/x86/ssim_opt.asm | 0 {vp8 => vp9}/encoder/x86/subtract_mmx.asm | 0 {vp8 => vp9}/encoder/x86/subtract_sse2.asm | 0 .../x86/temporal_filter_apply_sse2.asm | 0 .../encoder/x86/temporal_filter_x86.h | 0 .../encoder/x86/variance_impl_mmx.asm | 0 .../encoder/x86/variance_impl_sse2.asm | 0 .../encoder/x86/variance_impl_ssse3.asm | 0 {vp8 => vp9}/encoder/x86/variance_mmx.c | 4 +- {vp8 => vp9}/encoder/x86/variance_sse2.c | 4 +- {vp8 => vp9}/encoder/x86/variance_ssse3.c | 4 +- .../encoder/x86/x86_csystemdependent.c | 4 +- {vp8 => vp9}/exports_dec | 0 {vp8 => vp9}/exports_enc | 0 vp9/vp9_common.mk | 179 ++++++++++++++++++ vp8/vp8_cx_iface.c => vp9/vp9_cx_iface.c | 6 +- vp8/vp8_dx_iface.c => vp9/vp9_dx_iface.c | 0 vp9/vp9cx.mk | 120 ++++++++++++ vp9/vp9cx_arm.mk | 63 ++++++ vp9/vp9dx.mk | 71 +++++++ vp8/vp8dx_arm.mk => vp9/vp9dx_arm.mk | 0 vpx/vp8.h | 4 +- vpx/vp8cx.h | 4 +- vpx/vp8dx.h | 4 +- vpx/vp8e.h | 4 +- vpxdec.c | 16 +- vpxenc.c | 18 +- 342 files changed, 768 insertions(+), 768 deletions(-) delete mode 100644 vp8/vp8_common.mk delete mode 100644 vp8/vp8cx.mk delete mode 100644 vp8/vp8cx_arm.mk delete mode 100644 vp8/vp8dx.mk rename {vp8 => vp9}/common/alloccommon.c (100%) rename {vp8 => vp9}/common/alloccommon.h (100%) rename {vp8 => vp9}/common/arm/arm_systemdependent.c (94%) rename {vp8 => vp9}/common/arm/armv6/bilinearfilter_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/copymem16x16_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/copymem8x4_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/copymem8x8_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/dc_only_idct_add_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/filter_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/idct_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/iwalsh_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/loopfilter_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/recon_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/simpleloopfilter_v6.asm (100%) rename {vp8 => vp9}/common/arm/armv6/sixtappredict8x4_v6.asm (100%) rename {vp8 => vp9}/common/arm/bilinearfilter_arm.c (97%) rename {vp8 => vp9}/common/arm/bilinearfilter_arm.h (100%) rename {vp8 => vp9}/common/arm/filter_arm.c (98%) rename {vp8 => vp9}/common/arm/idct_arm.h (100%) rename {vp8 => vp9}/common/arm/loopfilter_arm.c (99%) rename {vp8 => vp9}/common/arm/loopfilter_arm.h (100%) rename {vp8 => vp9}/common/arm/neon/bilinearpredict16x16_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/bilinearpredict4x4_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/bilinearpredict8x4_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/bilinearpredict8x8_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/buildintrapredictorsmby_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/copymem16x16_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/copymem8x4_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/copymem8x8_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/dc_only_idct_add_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/iwalsh_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/loopfilter_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/loopfiltersimpleverticaledge_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/mbloopfilter_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/recon16x16mb_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/recon2b_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/recon4b_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/recon_neon.c (94%) rename {vp8 => vp9}/common/arm/neon/reconb_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/save_neon_reg.asm (100%) rename {vp8 => vp9}/common/arm/neon/shortidct4x4llm_1_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/shortidct4x4llm_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/sixtappredict16x16_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/sixtappredict4x4_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/sixtappredict8x4_neon.asm (100%) rename {vp8 => vp9}/common/arm/neon/sixtappredict8x8_neon.asm (100%) rename {vp8 => vp9}/common/arm/recon_arm.h (100%) rename {vp8 => vp9}/common/arm/reconintra_arm.c (94%) rename {vp8 => vp9}/common/arm/subpixel_arm.h (100%) rename {vp8 => vp9}/common/asm_com_offsets.c (100%) rename {vp8 => vp9}/common/blockd.c (100%) rename {vp8 => vp9}/common/blockd.h (100%) rename {vp8 => vp9}/common/coefupdateprobs.h (100%) rename {vp8 => vp9}/common/common.h (100%) rename {vp8 => vp9}/common/common_types.h (100%) rename {vp8 => vp9}/common/context.c (100%) rename {vp8 => vp9}/common/debugmodes.c (100%) rename {vp8 => vp9}/common/default_coef_probs.h (100%) rename {vp8 => vp9}/common/entropy.c (100%) rename {vp8 => vp9}/common/entropy.h (100%) rename {vp8 => vp9}/common/entropymode.c (99%) rename {vp8 => vp9}/common/entropymode.h (100%) rename {vp8 => vp9}/common/entropymv.c (100%) rename {vp8 => vp9}/common/entropymv.h (100%) rename {vp8 => vp9}/common/extend.c (100%) rename {vp8 => vp9}/common/extend.h (100%) rename {vp8 => vp9}/common/filter.c (100%) rename {vp8 => vp9}/common/filter.h (100%) rename {vp8 => vp9}/common/findnearmv.c (99%) rename {vp8 => vp9}/common/findnearmv.h (100%) rename {vp8 => vp9}/common/generic/systemdependent.c (94%) rename {vp8 => vp9}/common/header.h (100%) rename {vp8 => vp9}/common/idct.h (99%) rename {vp8 => vp9}/common/idctllm.c (99%) rename {vp8 => vp9}/common/implicit_segmentation.c (99%) rename {vp8 => vp9}/common/invtrans.c (100%) rename {vp8 => vp9}/common/invtrans.h (100%) rename {vp8 => vp9}/common/loopfilter.c (99%) rename {vp8 => vp9}/common/loopfilter.h (100%) rename {vp8 => vp9}/common/loopfilter_filters.c (100%) rename {vp8 => vp9}/common/maskingmv.c (100%) rename {vp8 => vp9}/common/mbpitch.c (100%) rename {vp8 => vp9}/common/modecont.c (100%) rename {vp8 => vp9}/common/modecont.h (100%) rename {vp8 => vp9}/common/modecontext.c (100%) rename {vp8 => vp9}/common/mv.h (100%) rename {vp8 => vp9}/common/mvref_common.c (100%) rename {vp8 => vp9}/common/mvref_common.h (100%) rename {vp8 => vp9}/common/onyx.h (100%) rename {vp8 => vp9}/common/onyxc_int.h (100%) rename {vp8 => vp9}/common/onyxd.h (100%) rename {vp8 => vp9}/common/postproc.c (100%) rename {vp8 => vp9}/common/postproc.h (100%) rename {vp8 => vp9}/common/ppc/copy_altivec.asm (100%) rename {vp8 => vp9}/common/ppc/filter_altivec.asm (100%) rename {vp8 => vp9}/common/ppc/filter_bilinear_altivec.asm (100%) rename {vp8 => vp9}/common/ppc/idctllm_altivec.asm (100%) rename {vp8 => vp9}/common/ppc/loopfilter_altivec.c (100%) rename {vp8 => vp9}/common/ppc/loopfilter_filters_altivec.asm (100%) rename {vp8 => vp9}/common/ppc/platform_altivec.asm (100%) rename {vp8 => vp9}/common/ppc/recon_altivec.asm (100%) rename {vp8 => vp9}/common/ppc/systemdependent.c (100%) rename {vp8 => vp9}/common/ppflags.h (100%) rename {vp8 => vp9}/common/pragmas.h (100%) rename {vp8 => vp9}/common/pred_common.c (99%) rename {vp8 => vp9}/common/pred_common.h (98%) rename {vp8 => vp9}/common/quant_common.c (100%) rename {vp8 => vp9}/common/quant_common.h (100%) rename {vp8 => vp9}/common/recon.c (100%) rename {vp8 => vp9}/common/reconinter.c (100%) rename {vp8 => vp9}/common/reconinter.h (100%) rename {vp8 => vp9}/common/reconintra.c (100%) rename {vp8 => vp9}/common/reconintra.h (100%) rename {vp8 => vp9}/common/reconintra4x4.c (100%) rename {vp8 => vp9}/common/reconintra4x4.h (100%) rename {vp8 => vp9}/common/rtcd.c (100%) rename {vp8 => vp9}/common/rtcd_defs.sh (99%) rename {vp8 => vp9}/common/sadmxn.h (100%) rename {vp8 => vp9}/common/seg_common.c (99%) rename {vp8 => vp9}/common/seg_common.h (98%) rename {vp8 => vp9}/common/setupintrarecon.c (100%) rename {vp8 => vp9}/common/setupintrarecon.h (100%) rename {vp8 => vp9}/common/subpixel.h (100%) rename {vp8 => vp9}/common/swapyv12buffer.c (100%) rename {vp8 => vp9}/common/swapyv12buffer.h (100%) rename {vp8 => vp9}/common/systemdependent.h (100%) rename {vp8 => vp9}/common/tapify.py (100%) rename {vp8 => vp9}/common/textblit.c (100%) rename {vp8 => vp9}/common/treecoder.c (100%) rename {vp8 => vp9}/common/treecoder.h (100%) rename {vp8 => vp9}/common/type_aliases.h (100%) rename {vp8 => vp9}/common/x86/filter_sse2.c (99%) rename {vp8 => vp9}/common/x86/filter_sse4.c (99%) rename {vp8 => vp9}/common/x86/idct_x86.h (100%) rename {vp8 => vp9}/common/x86/idctllm_mmx.asm (100%) rename {vp8 => vp9}/common/x86/idctllm_sse2.asm (100%) rename {vp8 => vp9}/common/x86/iwalsh_mmx.asm (100%) rename {vp8 => vp9}/common/x86/iwalsh_sse2.asm (100%) rename {vp8 => vp9}/common/x86/loopfilter_mmx.asm (100%) rename {vp8 => vp9}/common/x86/loopfilter_sse2.asm (100%) rename {vp8 => vp9}/common/x86/loopfilter_x86.c (99%) rename {vp8 => vp9}/common/x86/loopfilter_x86.h (100%) rename {vp8 => vp9}/common/x86/mask_sse3.asm (100%) rename {vp8 => vp9}/common/x86/postproc_mmx.asm (100%) rename {vp8 => vp9}/common/x86/postproc_sse2.asm (100%) rename {vp8 => vp9}/common/x86/postproc_x86.h (100%) rename {vp8 => vp9}/common/x86/recon_mmx.asm (100%) rename {vp8 => vp9}/common/x86/recon_sse2.asm (100%) rename {vp8 => vp9}/common/x86/recon_wrapper_sse2.c (99%) rename {vp8 => vp9}/common/x86/sadmxn_x86.c (100%) rename {vp8 => vp9}/common/x86/subpixel_8t_ssse3.asm (100%) rename {vp8 => vp9}/common/x86/subpixel_mmx.asm (100%) rename {vp8 => vp9}/common/x86/subpixel_sse2.asm (100%) rename {vp8 => vp9}/common/x86/subpixel_ssse3.asm (100%) rename {vp8 => vp9}/common/x86/subpixel_x86.h (100%) rename {vp8 => vp9}/common/x86/vp8_asm_stubs.c (99%) rename {vp8 => vp9}/common/x86/x86_systemdependent.c (95%) rename {vp8 => vp9}/decoder/arm/armv6/dequant_dc_idct_v6.asm (100%) rename {vp8 => vp9}/decoder/arm/armv6/dequant_idct_v6.asm (100%) rename {vp8 => vp9}/decoder/arm/armv6/dequantize_v6.asm (100%) rename {vp8 => vp9}/decoder/arm/armv6/idct_blk_v6.c (98%) rename {vp8 => vp9}/decoder/arm/dequantize_arm.c (94%) rename {vp8 => vp9}/decoder/arm/neon/dequant_idct_neon.asm (100%) rename {vp8 => vp9}/decoder/arm/neon/dequantizeb_neon.asm (100%) rename {vp8 => vp9}/decoder/arm/neon/idct_blk_neon.c (97%) rename {vp8 => vp9}/decoder/arm/neon/idct_dequant_0_2x_neon.asm (100%) rename {vp8 => vp9}/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm (100%) rename {vp8 => vp9}/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm (100%) rename {vp8 => vp9}/decoder/arm/neon/idct_dequant_full_2x_neon.asm (100%) rename {vp8 => vp9}/decoder/asm_dec_offsets.c (100%) rename {vp8 => vp9}/decoder/dboolhuff.c (100%) rename {vp8 => vp9}/decoder/dboolhuff.h (100%) rename {vp8 => vp9}/decoder/decodemv.c (99%) rename {vp8 => vp9}/decoder/decodemv.h (100%) rename {vp8 => vp9}/decoder/decodframe.c (98%) rename {vp8 => vp9}/decoder/dequantize.c (99%) rename {vp8 => vp9}/decoder/dequantize.h (99%) rename {vp8 => vp9}/decoder/detokenize.c (99%) rename {vp8 => vp9}/decoder/detokenize.h (100%) rename {vp8 => vp9}/decoder/idct_blk.c (99%) rename {vp8 => vp9}/decoder/onyxd_if.c (97%) rename {vp8 => vp9}/decoder/onyxd_int.h (97%) rename {vp8 => vp9}/decoder/reconintra_mt.h (100%) rename {vp8 => vp9}/decoder/treereader.h (96%) rename {vp8 => vp9}/decoder/x86/dequantize_mmx.asm (100%) rename {vp8 => vp9}/decoder/x86/idct_blk_mmx.c (98%) rename {vp8 => vp9}/decoder/x86/idct_blk_sse2.c (98%) rename {vp8 => vp9}/decoder/x86/x86_dsystemdependent.c (95%) rename {vp8 => vp9}/encoder/arm/arm_csystemdependent.c (98%) rename {vp8 => vp9}/encoder/arm/armv5te/boolhuff_armv5te.asm (100%) rename {vp8 => vp9}/encoder/arm/armv5te/vp8_packtokens_armv5.asm (100%) rename {vp8 => vp9}/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm (100%) rename {vp8 => vp9}/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_mse16x16_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_sad16x16_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_subtract_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_variance16x16_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_variance8x8_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm (100%) rename {vp8 => vp9}/encoder/arm/armv6/walsh_v6.asm (100%) rename {vp8 => vp9}/encoder/arm/boolhuff_arm.c (96%) rename {vp8 => vp9}/encoder/arm/dct_arm.c (100%) rename {vp8 => vp9}/encoder/arm/dct_arm.h (100%) rename {vp8 => vp9}/encoder/arm/encodemb_arm.h (100%) rename {vp8 => vp9}/encoder/arm/neon/fastquantizeb_neon.asm (99%) rename {vp8 => vp9}/encoder/arm/neon/picklpf_arm.c (90%) rename {vp8 => vp9}/encoder/arm/neon/sad16_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/sad8_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/shortfdct_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/subtract_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/variance_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/vp8_memcpy_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/vp8_mse16x16_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm (100%) rename {vp8 => vp9}/encoder/arm/quantize_arm.c (96%) rename {vp8 => vp9}/encoder/arm/quantize_arm.h (100%) rename {vp8 => vp9}/encoder/arm/variance_arm.c (97%) rename {vp8 => vp9}/encoder/arm/variance_arm.h (100%) rename {vp8 => vp9}/encoder/asm_enc_offsets.c (99%) rename {vp8 => vp9}/encoder/bitstream.c (99%) rename {vp8 => vp9}/encoder/bitstream.h (100%) rename {vp8 => vp9}/encoder/block.h (97%) rename {vp8 => vp9}/encoder/boolhuff.c (100%) rename {vp8 => vp9}/encoder/boolhuff.h (100%) rename {vp8 => vp9}/encoder/dct.c (99%) rename {vp8 => vp9}/encoder/encodeframe.c (99%) rename {vp8 => vp9}/encoder/encodeintra.c (98%) rename {vp8 => vp9}/encoder/encodeintra.h (100%) rename {vp8 => vp9}/encoder/encodemb.c (99%) rename {vp8 => vp9}/encoder/encodemb.h (100%) rename {vp8 => vp9}/encoder/encodemv.c (99%) rename {vp8 => vp9}/encoder/encodemv.h (100%) rename {vp8 => vp9}/encoder/firstpass.c (99%) rename {vp8 => vp9}/encoder/firstpass.h (100%) rename {vp8 => vp9}/encoder/generic/csystemdependent.c (95%) rename {vp8 => vp9}/encoder/lookahead.c (99%) rename {vp8 => vp9}/encoder/lookahead.h (100%) rename {vp8 => vp9}/encoder/mbgraph.c (98%) rename {vp8 => vp9}/encoder/mbgraph.h (100%) rename {vp8 => vp9}/encoder/mcomp.c (99%) rename {vp8 => vp9}/encoder/mcomp.h (100%) rename {vp8 => vp9}/encoder/modecosts.c (96%) rename {vp8 => vp9}/encoder/modecosts.h (100%) rename {vp8 => vp9}/encoder/onyx_if.c (99%) rename {vp8 => vp9}/encoder/onyx_int.h (99%) rename {vp8 => vp9}/encoder/picklpf.c (99%) rename {vp8 => vp9}/encoder/ppc/csystemdependent.c (98%) rename {vp8 => vp9}/encoder/ppc/encodemb_altivec.asm (100%) rename {vp8 => vp9}/encoder/ppc/fdct_altivec.asm (100%) rename {vp8 => vp9}/encoder/ppc/rdopt_altivec.asm (100%) rename {vp8 => vp9}/encoder/ppc/sad_altivec.asm (100%) rename {vp8 => vp9}/encoder/ppc/variance_altivec.asm (100%) rename {vp8 => vp9}/encoder/ppc/variance_subpixel_altivec.asm (100%) rename {vp8 => vp9}/encoder/psnr.c (92%) rename {vp8 => vp9}/encoder/psnr.h (100%) rename {vp8 => vp9}/encoder/quantize.c (99%) rename {vp8 => vp9}/encoder/quantize.h (100%) rename {vp8 => vp9}/encoder/ratectrl.c (99%) rename {vp8 => vp9}/encoder/ratectrl.h (100%) rename {vp8 => vp9}/encoder/rdopt.c (99%) rename {vp8 => vp9}/encoder/rdopt.h (100%) rename {vp8 => vp9}/encoder/sad_c.c (99%) rename {vp8 => vp9}/encoder/satd_c.c (100%) rename {vp8 => vp9}/encoder/segmentation.c (99%) rename {vp8 => vp9}/encoder/segmentation.h (98%) rename {vp8 => vp9}/encoder/ssim.c (100%) rename {vp8 => vp9}/encoder/temporal_filter.c (98%) rename {vp8 => vp9}/encoder/temporal_filter.h (100%) rename {vp8 => vp9}/encoder/tokenize.c (99%) rename {vp8 => vp9}/encoder/tokenize.h (98%) rename {vp8 => vp9}/encoder/treewriter.c (100%) rename {vp8 => vp9}/encoder/treewriter.h (98%) rename {vp8 => vp9}/encoder/variance.h (100%) rename {vp8 => vp9}/encoder/variance_c.c (99%) rename {vp8 => vp9}/encoder/x86/dct_mmx.asm (100%) rename {vp8 => vp9}/encoder/x86/dct_sse2.asm (100%) rename {vp8 => vp9}/encoder/x86/encodeopt.asm (100%) rename {vp8 => vp9}/encoder/x86/fwalsh_sse2.asm (100%) rename {vp8 => vp9}/encoder/x86/mcomp_x86.h (100%) rename {vp8 => vp9}/encoder/x86/quantize_mmx.asm (100%) rename {vp8 => vp9}/encoder/x86/quantize_sse2.asm (99%) rename {vp8 => vp9}/encoder/x86/quantize_sse4.asm (98%) rename {vp8 => vp9}/encoder/x86/quantize_ssse3.asm (100%) rename {vp8 => vp9}/encoder/x86/quantize_x86.h (100%) rename {vp8 => vp9}/encoder/x86/sad_mmx.asm (100%) rename {vp8 => vp9}/encoder/x86/sad_sse2.asm (100%) rename {vp8 => vp9}/encoder/x86/sad_sse3.asm (100%) rename {vp8 => vp9}/encoder/x86/sad_sse4.asm (100%) rename {vp8 => vp9}/encoder/x86/sad_ssse3.asm (100%) rename {vp8 => vp9}/encoder/x86/ssim_opt.asm (100%) rename {vp8 => vp9}/encoder/x86/subtract_mmx.asm (100%) rename {vp8 => vp9}/encoder/x86/subtract_sse2.asm (100%) rename {vp8 => vp9}/encoder/x86/temporal_filter_apply_sse2.asm (100%) rename {vp8 => vp9}/encoder/x86/temporal_filter_x86.h (100%) rename {vp8 => vp9}/encoder/x86/variance_impl_mmx.asm (100%) rename {vp8 => vp9}/encoder/x86/variance_impl_sse2.asm (100%) rename {vp8 => vp9}/encoder/x86/variance_impl_ssse3.asm (100%) rename {vp8 => vp9}/encoder/x86/variance_mmx.c (99%) rename {vp8 => vp9}/encoder/x86/variance_sse2.c (99%) rename {vp8 => vp9}/encoder/x86/variance_ssse3.c (98%) rename {vp8 => vp9}/encoder/x86/x86_csystemdependent.c (98%) rename {vp8 => vp9}/exports_dec (100%) rename {vp8 => vp9}/exports_enc (100%) create mode 100644 vp9/vp9_common.mk rename vp8/vp8_cx_iface.c => vp9/vp9_cx_iface.c (99%) rename vp8/vp8_dx_iface.c => vp9/vp9_dx_iface.c (100%) create mode 100644 vp9/vp9cx.mk create mode 100644 vp9/vp9cx_arm.mk create mode 100644 vp9/vp9dx.mk rename vp8/vp8dx_arm.mk => vp9/vp9dx_arm.mk (100%) diff --git a/build/x86-msvs/obj_int_extract.bat b/build/x86-msvs/obj_int_extract.bat index 1bb865331..e2b93b1f6 100644 --- a/build/x86-msvs/obj_int_extract.bat +++ b/build/x86-msvs/obj_int_extract.bat @@ -7,9 +7,9 @@ REM in the file PATENTS. All contributing project authors may REM be found in the AUTHORS file in the root of the source tree. echo on -cl /I "./" /I "%1" /nologo /c "%1/vp8/common/asm_com_offsets.c" -cl /I "./" /I "%1" /nologo /c "%1/vp8/decoder/asm_dec_offsets.c" -cl /I "./" /I "%1" /nologo /c "%1/vp8/encoder/asm_enc_offsets.c" +cl /I "./" /I "%1" /nologo /c "%1/vp9/common/asm_com_offsets.c" +cl /I "./" /I "%1" /nologo /c "%1/vp9/decoder/asm_dec_offsets.c" +cl /I "./" /I "%1" /nologo /c "%1/vp9/encoder/asm_enc_offsets.c" obj_int_extract.exe rvds "asm_com_offsets.obj" > "asm_com_offsets.asm" obj_int_extract.exe rvds "asm_dec_offsets.obj" > "asm_dec_offsets.asm" obj_int_extract.exe rvds "asm_enc_offsets.obj" > "asm_enc_offsets.asm" diff --git a/configure b/configure index e95508693..638d0df1e 100755 --- a/configure +++ b/configure @@ -31,7 +31,7 @@ Advanced options: ${toggle_debug_libs} in/exclude debug version of libraries ${toggle_md5} support for output of checksum data ${toggle_static_msvcrt} use static MSVCRT (VS builds only) - ${toggle_vp8} VP8 codec support + ${toggle_vp9} VP9 codec support ${toggle_internal_stats} output of encoder internal stats for debug, if supported (encoders) ${toggle_mem_tracker} track memory usage ${toggle_postproc} postprocessing @@ -161,17 +161,17 @@ enable spatial_resampling enable os_support [ -d ${source_path}/../include ] && enable alt_tree_layout -for d in vp8; do +for d in vp9; do [ -d ${source_path}/${d} ] && disable alt_tree_layout; done if ! enabled alt_tree_layout; then # development environment -[ -d ${source_path}/vp8 ] && CODECS="${CODECS} vp8_encoder vp8_decoder" +[ -d ${source_path}/vp9 ] && CODECS="${CODECS} vp9_encoder vp9_decoder" else # customer environment -[ -f ${source_path}/../include/vpx/vp8cx.h ] && CODECS="${CODECS} vp8_encoder" -[ -f ${source_path}/../include/vpx/vp8dx.h ] && CODECS="${CODECS} vp8_decoder" +[ -f ${source_path}/../include/vpx/vp8cx.h ] && CODECS="${CODECS} vp9_encoder" +[ -f ${source_path}/../include/vpx/vp8dx.h ] && CODECS="${CODECS} vp9_decoder" [ -f ${source_path}/../lib/*/*mt.lib ] && soft_enable static_msvcrt fi diff --git a/docs.mk b/docs.mk index 98332a244..0d448b86c 100644 --- a/docs.mk +++ b/docs.mk @@ -21,7 +21,7 @@ CODEC_DOX := mainpage.dox \ usage_dx.dox \ # Other doxy files sourced in Markdown -TXT_DOX-$(CONFIG_VP8) += vp8_api1_migration.dox +TXT_DOX-$(CONFIG_VP9) += vp8_api1_migration.dox vp8_api1_migration.dox.DESC = VP8 API 1.x Migration TXT_DOX = $(call enabled,TXT_DOX) diff --git a/example_xma.c b/example_xma.c index f5c09162d..7aa879810 100644 --- a/example_xma.c +++ b/example_xma.c @@ -18,7 +18,7 @@ #include "vpx_config.h" #include "vpx/vpx_decoder.h" #include "vpx/vpx_integer.h" -#if CONFIG_VP8_DECODER +#if CONFIG_VP9_DECODER #include "vpx/vp8dx.h" #endif @@ -29,8 +29,8 @@ static const struct { const char *name; const vpx_codec_iface_t *iface; } ifaces[] = { -#if CONFIG_VP8_DECODER - {"vp8", &vpx_codec_vp8_dx_algo}, +#if CONFIG_VP9_DECODER + {"vp9", &vpx_codec_vp8_dx_algo}, #endif }; diff --git a/examples.mk b/examples.mk index 478ce7640..74fb68156 100644 --- a/examples.mk +++ b/examples.mk @@ -81,13 +81,13 @@ GEN_EXAMPLES-$(CONFIG_ENCODERS) += error_resilient.c error_resilient.GUID = DF5837B9-4145-4F92-A031-44E4F832E00C error_resilient.DESCRIPTION = Error Resiliency Feature -GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_scalable_patterns.c +GEN_EXAMPLES-$(CONFIG_VP9_ENCODER) += vp8_scalable_patterns.c vp8_scalable_patterns.GUID = 0D6A210B-F482-4D6F-8570-4A9C01ACC88C vp8_scalable_patterns.DESCRIPTION = VP8 Scalable Bitstream Patterns -GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_set_maps.c +GEN_EXAMPLES-$(CONFIG_VP9_ENCODER) += vp8_set_maps.c vp8_set_maps.GUID = ECB2D24D-98B8-4015-A465-A4AF3DCC145F vp8_set_maps.DESCRIPTION = VP8 set active and ROI maps -GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8cx_set_ref.c +GEN_EXAMPLES-$(CONFIG_VP9_ENCODER) += vp8cx_set_ref.c vp8cx_set_ref.GUID = C5E31F7F-96F6-48BD-BD3E-10EBF6E8057A vp8cx_set_ref.DESCRIPTION = VP8 set encoder reference frame @@ -97,10 +97,10 @@ vp8cx_set_ref.DESCRIPTION = VP8 set encoder reference frame # We should not link to math library (libm) on RVCT # when building for bare-metal targets ifeq ($(CONFIG_OS_SUPPORT), yes) -CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m +CODEC_EXTRA_LIBS-$(CONFIG_VP9) += m else ifeq ($(CONFIG_GCC), yes) - CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m + CODEC_EXTRA_LIBS-$(CONFIG_VP9) += m endif endif # @@ -117,8 +117,8 @@ ifeq ($(HAVE_ALT_TREE_LAYOUT),yes) INC_PATH := $(SRC_PATH_BARE)/../include else LIB_PATH-yes += $(if $(BUILD_PFX),$(BUILD_PFX),.) - INC_PATH-$(CONFIG_VP8_DECODER) += $(SRC_PATH_BARE)/vp8 - INC_PATH-$(CONFIG_VP8_ENCODER) += $(SRC_PATH_BARE)/vp8 + INC_PATH-$(CONFIG_VP9_DECODER) += $(SRC_PATH_BARE)/vp9 + INC_PATH-$(CONFIG_VP9_ENCODER) += $(SRC_PATH_BARE)/vp9 LIB_PATH := $(call enabled,LIB_PATH) INC_PATH := $(call enabled,INC_PATH) endif diff --git a/examples/decoder_tmpl.txt b/examples/decoder_tmpl.txt index 92a2c3013..90a9b2cc9 100644 --- a/examples/decoder_tmpl.txt +++ b/examples/decoder_tmpl.txt @@ -1,7 +1,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DEC_INCLUDES #define VPX_CODEC_DISABLE_COMPAT 1 #include "vpx/vpx_decoder.h" -#include "vpx/vp8dx.h" +#include "vpx/vp9dx.h" #define interface (vpx_codec_vp8_dx()) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DEC_INCLUDES diff --git a/examples/encoder_tmpl.txt b/examples/encoder_tmpl.txt index 00420713a..afc119367 100644 --- a/examples/encoder_tmpl.txt +++ b/examples/encoder_tmpl.txt @@ -1,7 +1,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ENC_INCLUDES #define VPX_CODEC_DISABLE_COMPAT 1 #include "vpx/vpx_encoder.h" -#include "vpx/vp8cx.h" +#include "vpx/vp9cx.h" #define interface (vpx_codec_vp8_cx()) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ENC_INCLUDES diff --git a/examples/postproc.txt b/examples/postproc.txt index 0940ea24c..40f75f2c5 100644 --- a/examples/postproc.txt +++ b/examples/postproc.txt @@ -51,7 +51,7 @@ Some codecs provide fine grained controls over their built-in postprocessors. VP8 is one example. The following sample code toggles postprocessing on and off every 15 frames. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PRE_DECODE -#if CONFIG_VP8_DECODER +#if CONFIG_VP9_DECODER if(frame_cnt%30 == 1) { vp8_postproc_cfg_t pp = {0, 0, 0}; diff --git a/libs.mk b/libs.mk index 674571add..abb7a8e3d 100644 --- a/libs.mk +++ b/libs.mk @@ -30,29 +30,29 @@ include $(SRC_PATH_BARE)/vpx_scale/vpx_scale.mk CODEC_SRCS-yes += $(addprefix vpx_scale/,$(call enabled,SCALE_SRCS)) -ifeq ($(CONFIG_VP8_ENCODER),yes) - VP8_PREFIX=vp8/ - include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx.mk - CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS)) - CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS)) - CODEC_SRCS-yes += $(VP8_PREFIX)vp8cx.mk vpx/vp8.h vpx/vp8cx.h vpx/vp8e.h - CODEC_SRCS-$(ARCH_ARM) += $(VP8_PREFIX)vp8cx_arm.mk +ifeq ($(CONFIG_VP9_ENCODER),yes) + VP9_PREFIX=vp9/ + include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk + CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS)) + CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS)) + CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h vpx/vp8e.h + CODEC_SRCS-$(ARCH_ARM) += $(VP9_PREFIX)vp98cx_arm.mk INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8e.h include/vpx/vp8cx.h - INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/% + INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h - CODEC_DOC_SECTIONS += vp8 vp8_encoder + CODEC_DOC_SECTIONS += vp9 vp9_encoder endif -ifeq ($(CONFIG_VP8_DECODER),yes) - VP8_PREFIX=vp8/ - include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8dx.mk - CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_DX_SRCS)) - CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_DX_EXPORTS)) - CODEC_SRCS-yes += $(VP8_PREFIX)vp8dx.mk vpx/vp8.h vpx/vp8dx.h +ifeq ($(CONFIG_VP9_DECODER),yes) + VP9_PREFIX=vp9/ + include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk + CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_DX_SRCS)) + CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_DX_EXPORTS)) + CODEC_SRCS-yes += $(VP9_PREFIX)vp9dx.mk vpx/vp8.h vpx/vp8dx.h INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h - INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/% + INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h - CODEC_DOC_SECTIONS += vp8 vp8_decoder + CODEC_DOC_SECTIONS += vp9 vp9_decoder endif @@ -305,46 +305,46 @@ $(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm OFFSET_PATTERN:='^[a-zA-Z0-9_]* EQU' ifeq ($(filter icc gcc,$(TGT_CC)), $(TGT_CC)) - $(BUILD_PFX)asm_com_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S + $(BUILD_PFX)asm_com_offsets.asm: $(BUILD_PFX)$(VP9_PREFIX)common/asm_com_offsets.c.S @echo " [CREATE] $@" $(qexec)LC_ALL=C grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@ - $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S: $(VP8_PREFIX)common/asm_com_offsets.c - CLEAN-OBJS += $(BUILD_PFX)asm_com_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S + $(BUILD_PFX)$(VP9_PREFIX)common/asm_com_offsets.c.S: $(VP9_PREFIX)common/asm_com_offsets.c + CLEAN-OBJS += $(BUILD_PFX)asm_com_offsets.asm $(BUILD_PFX)$(VP9_PREFIX)common/asm_com_offsets.c.S - $(BUILD_PFX)asm_enc_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S + $(BUILD_PFX)asm_enc_offsets.asm: $(BUILD_PFX)$(VP9_PREFIX)encoder/asm_enc_offsets.c.S @echo " [CREATE] $@" $(qexec)LC_ALL=C grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@ - $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S: $(VP8_PREFIX)encoder/asm_enc_offsets.c - CLEAN-OBJS += $(BUILD_PFX)asm_enc_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S + $(BUILD_PFX)$(VP9_PREFIX)encoder/asm_enc_offsets.c.S: $(VP9_PREFIX)encoder/asm_enc_offsets.c + CLEAN-OBJS += $(BUILD_PFX)asm_enc_offsets.asm $(BUILD_PFX)$(VP9_PREFIX)encoder/asm_enc_offsets.c.S - $(BUILD_PFX)asm_dec_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S + $(BUILD_PFX)asm_dec_offsets.asm: $(BUILD_PFX)$(VP9_PREFIX)decoder/asm_dec_offsets.c.S @echo " [CREATE] $@" $(qexec)LC_ALL=C grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@ - $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S: $(VP8_PREFIX)decoder/asm_dec_offsets.c - CLEAN-OBJS += $(BUILD_PFX)asm_dec_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S + $(BUILD_PFX)$(VP9_PREFIX)decoder/asm_dec_offsets.c.S: $(VP9_PREFIX)decoder/asm_dec_offsets.c + CLEAN-OBJS += $(BUILD_PFX)asm_dec_offsets.asm $(BUILD_PFX)$(VP9_PREFIX)decoder/asm_dec_offsets.c.S else ifeq ($(filter rvct,$(TGT_CC)), $(TGT_CC)) asm_com_offsets.asm: obj_int_extract - asm_com_offsets.asm: $(VP8_PREFIX)common/asm_com_offsets.c.o + asm_com_offsets.asm: $(VP9_PREFIX)common/asm_com_offsets.c.o @echo " [CREATE] $@" $(qexec)./obj_int_extract rvds $< $(ADS2GAS) > $@ - OBJS-yes += $(VP8_PREFIX)common/asm_com_offsets.c.o + OBJS-yes += $(VP9_PREFIX)common/asm_com_offsets.c.o CLEAN-OBJS += asm_com_offsets.asm $(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)asm_com_offsets.asm asm_enc_offsets.asm: obj_int_extract - asm_enc_offsets.asm: $(VP8_PREFIX)encoder/asm_enc_offsets.c.o + asm_enc_offsets.asm: $(VP9_PREFIX)encoder/asm_enc_offsets.c.o @echo " [CREATE] $@" $(qexec)./obj_int_extract rvds $< $(ADS2GAS) > $@ - OBJS-yes += $(VP8_PREFIX)encoder/asm_enc_offsets.c.o + OBJS-yes += $(VP9_PREFIX)encoder/asm_enc_offsets.c.o CLEAN-OBJS += asm_enc_offsets.asm $(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)asm_enc_offsets.asm asm_dec_offsets.asm: obj_int_extract - asm_dec_offsets.asm: $(VP8_PREFIX)decoder/asm_dec_offsets.c.o + asm_dec_offsets.asm: $(VP9_PREFIX)decoder/asm_dec_offsets.c.o @echo " [CREATE] $@" $(qexec)./obj_int_extract rvds $< $(ADS2GAS) > $@ - OBJS-yes += $(VP8_PREFIX)decoder/asm_dec_offsets.c.o + OBJS-yes += $(VP9_PREFIX)decoder/asm_dec_offsets.c.o CLEAN-OBJS += asm_dec_offsets.asm $(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)asm_dec_offsets.asm endif diff --git a/test/boolcoder_test.cc b/test/boolcoder_test.cc index 758c8c3e5..119c77a79 100644 --- a/test/boolcoder_test.cc +++ b/test/boolcoder_test.cc @@ -15,8 +15,8 @@ #include "third_party/googletest/src/include/gtest/gtest.h" extern "C" { -#include "vp8/encoder/boolhuff.h" -#include "vp8/decoder/dboolhuff.h" +#include "vp9/encoder/boolhuff.h" +#include "vp9/decoder/dboolhuff.h" } #include "acm_random.h" diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index 26bf4940b..a0b91f389 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc @@ -15,9 +15,9 @@ #include "third_party/googletest/src/include/gtest/gtest.h" extern "C" { -#include "vp8/common/entropy.h" -#include "vp8/common/idct.h" -#include "vp8/encoder/dct.h" +#include "vp9/common/entropy.h" +#include "vp9/common/idct.h" +#include "vp9/encoder/dct.h" } #include "acm_random.h" diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc index 3bce41a41..d7066b3ff 100644 --- a/test/fdct4x4_test.cc +++ b/test/fdct4x4_test.cc @@ -15,8 +15,8 @@ #include "third_party/googletest/src/include/gtest/gtest.h" extern "C" { -#include "vp8/common/idct.h" -#include "vp8/encoder/dct.h" +#include "vp9/common/idct.h" +#include "vp9/encoder/dct.h" } #include "acm_random.h" diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc index 068d98e10..97680fe08 100644 --- a/test/fdct8x8_test.cc +++ b/test/fdct8x8_test.cc @@ -15,8 +15,8 @@ #include "third_party/googletest/src/include/gtest/gtest.h" extern "C" { -#include "vp8/encoder/dct.h" -#include "vp8/common/idct.h" +#include "vp9/encoder/dct.h" +#include "vp9/common/idct.h" } #include "acm_random.h" diff --git a/test/idct8x8_test.cc b/test/idct8x8_test.cc index a6308f826..6d3fe3d59 100644 --- a/test/idct8x8_test.cc +++ b/test/idct8x8_test.cc @@ -15,8 +15,8 @@ #include "third_party/googletest/src/include/gtest/gtest.h" extern "C" { -#include "vp8/encoder/dct.h" -#include "vp8/common/idct.h" +#include "vp9/encoder/dct.h" +#include "vp9/common/idct.h" } #include "acm_random.h" diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk deleted file mode 100644 index 87c1e6c6d..000000000 --- a/vp8/vp8_common.mk +++ /dev/null @@ -1,179 +0,0 @@ -## -## Copyright (c) 2010 The WebM project authors. All Rights Reserved. -## -## Use of this source code is governed by a BSD-style license -## that can be found in the LICENSE file in the root of the source -## tree. An additional intellectual property rights grant can be found -## in the file PATENTS. All contributing project authors may -## be found in the AUTHORS file in the root of the source tree. -## - -VP8_COMMON_SRCS-yes += vp8_common.mk -VP8_COMMON_SRCS-yes += common/type_aliases.h -VP8_COMMON_SRCS-yes += common/pragmas.h -VP8_COMMON_SRCS-yes += common/ppflags.h -VP8_COMMON_SRCS-yes += common/onyx.h -VP8_COMMON_SRCS-yes += common/onyxd.h -VP8_COMMON_SRCS-yes += common/alloccommon.c -VP8_COMMON_SRCS-yes += common/asm_com_offsets.c -VP8_COMMON_SRCS-yes += common/blockd.c -VP8_COMMON_SRCS-yes += common/coefupdateprobs.h -VP8_COMMON_SRCS-yes += common/debugmodes.c -VP8_COMMON_SRCS-yes += common/entropy.c -VP8_COMMON_SRCS-yes += common/entropymode.c -VP8_COMMON_SRCS-yes += common/entropymv.c -VP8_COMMON_SRCS-yes += common/extend.c -VP8_COMMON_SRCS-yes += common/filter.c -VP8_COMMON_SRCS-yes += common/filter.h -VP8_COMMON_SRCS-yes += common/findnearmv.c -VP8_COMMON_SRCS-yes += common/generic/systemdependent.c -VP8_COMMON_SRCS-yes += common/idctllm.c -VP8_COMMON_SRCS-yes += common/alloccommon.h -VP8_COMMON_SRCS-yes += common/blockd.h -VP8_COMMON_SRCS-yes += common/common.h -VP8_COMMON_SRCS-yes += common/common_types.h -VP8_COMMON_SRCS-yes += common/entropy.h -VP8_COMMON_SRCS-yes += common/entropymode.h -VP8_COMMON_SRCS-yes += common/entropymv.h -VP8_COMMON_SRCS-yes += common/extend.h -VP8_COMMON_SRCS-yes += common/findnearmv.h -VP8_COMMON_SRCS-yes += common/header.h -VP8_COMMON_SRCS-yes += common/idct.h -VP8_COMMON_SRCS-yes += common/invtrans.h -VP8_COMMON_SRCS-yes += common/loopfilter.h -VP8_COMMON_SRCS-yes += common/modecont.h -VP8_COMMON_SRCS-yes += common/mv.h -VP8_COMMON_SRCS-yes += common/onyxc_int.h -VP8_COMMON_SRCS-yes += common/pred_common.h -VP8_COMMON_SRCS-yes += common/pred_common.c -VP8_COMMON_SRCS-yes += common/quant_common.h -VP8_COMMON_SRCS-yes += common/reconinter.h -VP8_COMMON_SRCS-yes += common/reconintra.h -VP8_COMMON_SRCS-yes += common/reconintra4x4.h -VP8_COMMON_SRCS-yes += common/rtcd.c -VP8_COMMON_SRCS-yes += common/rtcd_defs.sh -VP8_COMMON_SRCS-yes += common/sadmxn.h -VP8_COMMON_SRCS-yes += common/seg_common.h -VP8_COMMON_SRCS-yes += common/seg_common.c -VP8_COMMON_SRCS-yes += common/setupintrarecon.h -VP8_COMMON_SRCS-yes += common/subpixel.h -VP8_COMMON_SRCS-yes += common/swapyv12buffer.h -VP8_COMMON_SRCS-yes += common/systemdependent.h -VP8_COMMON_SRCS-yes += common/treecoder.h -VP8_COMMON_SRCS-yes += common/invtrans.c -VP8_COMMON_SRCS-yes += common/loopfilter.c -VP8_COMMON_SRCS-yes += common/loopfilter_filters.c -VP8_COMMON_SRCS-yes += common/mbpitch.c -VP8_COMMON_SRCS-yes += common/modecont.c -VP8_COMMON_SRCS-yes += common/modecontext.c -VP8_COMMON_SRCS-yes += common/mvref_common.c -VP8_COMMON_SRCS-yes += common/mvref_common.h -VP8_COMMON_SRCS-yes += common/quant_common.c -VP8_COMMON_SRCS-yes += common/recon.c -VP8_COMMON_SRCS-yes += common/reconinter.c -VP8_COMMON_SRCS-yes += common/reconintra.c -VP8_COMMON_SRCS-yes += common/reconintra4x4.c -VP8_COMMON_SRCS-yes += common/setupintrarecon.c -VP8_COMMON_SRCS-yes += common/swapyv12buffer.c -VP8_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/textblit.c -VP8_COMMON_SRCS-yes += common/treecoder.c -VP8_COMMON_SRCS-$(CONFIG_IMPLICIT_SEGMENTATION) += common/implicit_segmentation.c - -VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/idct_x86.h -VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/subpixel_x86.h -VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/loopfilter_x86.h -VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/postproc_x86.h -VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/x86_systemdependent.c -VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp8_asm_stubs.c -VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/loopfilter_x86.c -VP8_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.h -VP8_COMMON_SRCS-$(CONFIG_POSTPROC) += common/postproc.c -VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/idctllm_mmx.asm -VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/iwalsh_mmx.asm -VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/recon_mmx.asm -VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/subpixel_mmx.asm -VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/loopfilter_mmx.asm -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idctllm_sse2.asm -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_sse2.asm -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_wrapper_sse2.c -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/subpixel_sse2.asm -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_sse2.asm -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/iwalsh_sse2.asm -VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_8t_ssse3.asm -VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_ssse3.asm -ifeq ($(CONFIG_POSTPROC),yes) -VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/postproc_mmx.asm -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm -endif - -# common (c) -ifeq ($(CONFIG_CSM),yes) -VP8_COMMON_SRCS-yes += common/maskingmv.c -VP8_COMMON_SRCS-$(HAVE_SSE3) += common/x86/mask_sse3.asm -endif - -VP8_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/filter_sse4.c -ifeq ($(HAVE_SSE4_1),yes) -vp8/common/x86/filter_sse4.c.o: CFLAGS += -msse4 -endif - -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/filter_sse2.c -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/sadmxn_x86.c -ifeq ($(HAVE_SSE2),yes) -vp8/common/x86/filter_sse2.c.o: CFLAGS += -msse2 -vp8/common/x86/loopfilter_x86.c.o: CFLAGS += -msse2 -vp8/common/x86/sadmxn_x86.c.o: CFLAGS += -msse2 -endif - -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/arm_systemdependent.c -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.c -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.h -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/filter_arm.c -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/idct_arm.h -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.c -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.h -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/recon_arm.h -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/reconintra_arm.c -VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/subpixel_arm.h - -# common (armv6) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/bilinearfilter_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x4_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x8_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem16x16_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/dc_only_idct_add_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/iwalsh_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/filter_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/idct_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/loopfilter_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/recon_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/simpleloopfilter_v6$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/sixtappredict8x4_v6$(ASM) - -# common (neon) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict4x4_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict8x4_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict8x8_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict16x16_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem8x4_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem8x8_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem16x16_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/dc_only_idct_add_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/iwalsh_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfilter_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfiltersimplehorizontaledge_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfiltersimpleverticaledge_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/mbloopfilter_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon2b_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon4b_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/reconb_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/shortidct4x4llm_1_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/shortidct4x4llm_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict4x4_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict8x4_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict8x8_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict16x16_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon16x16mb_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/buildintrapredictorsmby_neon$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/save_neon_reg$(ASM) -VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon_neon.c diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk deleted file mode 100644 index ef6da7cab..000000000 --- a/vp8/vp8cx.mk +++ /dev/null @@ -1,120 +0,0 @@ -## -## Copyright (c) 2010 The WebM project authors. All Rights Reserved. -## -## Use of this source code is governed by a BSD-style license -## that can be found in the LICENSE file in the root of the source -## tree. An additional intellectual property rights grant can be found -## in the file PATENTS. All contributing project authors may -## be found in the AUTHORS file in the root of the source tree. -## - - -include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk - -VP8_CX_EXPORTS += exports_enc - -VP8_CX_SRCS-yes += $(VP8_COMMON_SRCS-yes) -VP8_CX_SRCS-no += $(VP8_COMMON_SRCS-no) -VP8_CX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes) -VP8_CX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no) - -ifeq ($(ARCH_ARM),yes) - include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx_arm.mk -endif - -VP8_CX_SRCS-yes += vp8_cx_iface.c - -# encoder -#INCLUDES += algo/vpx_common/vpx_mem/include -#INCLUDES += common -#INCLUDES += common -#INCLUDES += common -#INCLUDES += algo/vpx_ref/cpu_id/include -#INCLUDES += common -#INCLUDES += encoder - -VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c -VP8_CX_SRCS-yes += encoder/bitstream.c -VP8_CX_SRCS-yes += encoder/boolhuff.c -VP8_CX_SRCS-yes += encoder/dct.c -VP8_CX_SRCS-yes += encoder/encodeframe.c -VP8_CX_SRCS-yes += encoder/encodeintra.c -VP8_CX_SRCS-yes += encoder/encodemb.c -VP8_CX_SRCS-yes += encoder/encodemv.c -VP8_CX_SRCS-yes += encoder/firstpass.c -VP8_CX_SRCS-yes += encoder/generic/csystemdependent.c -VP8_CX_SRCS-yes += encoder/block.h -VP8_CX_SRCS-yes += encoder/boolhuff.h -VP8_CX_SRCS-yes += encoder/bitstream.h -VP8_CX_SRCS-yes += encoder/encodeintra.h -VP8_CX_SRCS-yes += encoder/encodemb.h -VP8_CX_SRCS-yes += encoder/encodemv.h -VP8_CX_SRCS-yes += encoder/firstpass.h -VP8_CX_SRCS-yes += encoder/lookahead.c -VP8_CX_SRCS-yes += encoder/lookahead.h -VP8_CX_SRCS-yes += encoder/mcomp.h -VP8_CX_SRCS-yes += encoder/modecosts.h -VP8_CX_SRCS-yes += encoder/onyx_int.h -VP8_CX_SRCS-yes += encoder/psnr.h -VP8_CX_SRCS-yes += encoder/quantize.h -VP8_CX_SRCS-yes += encoder/ratectrl.h -VP8_CX_SRCS-yes += encoder/rdopt.h -VP8_CX_SRCS-yes += encoder/tokenize.h -VP8_CX_SRCS-yes += encoder/treewriter.h -VP8_CX_SRCS-yes += encoder/variance.h -VP8_CX_SRCS-yes += encoder/mcomp.c -VP8_CX_SRCS-yes += encoder/modecosts.c -VP8_CX_SRCS-yes += encoder/onyx_if.c -VP8_CX_SRCS-yes += encoder/picklpf.c -VP8_CX_SRCS-yes += encoder/psnr.c -VP8_CX_SRCS-yes += encoder/quantize.c -VP8_CX_SRCS-yes += encoder/ratectrl.c -VP8_CX_SRCS-yes += encoder/rdopt.c -VP8_CX_SRCS-yes += encoder/sad_c.c -VP8_CX_SRCS-yes += encoder/satd_c.c -VP8_CX_SRCS-yes += encoder/segmentation.c -VP8_CX_SRCS-yes += encoder/segmentation.h -VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c -VP8_CX_SRCS-yes += encoder/tokenize.c -VP8_CX_SRCS-yes += encoder/treewriter.c -VP8_CX_SRCS-yes += encoder/variance_c.c -ifeq ($(CONFIG_POSTPROC),yes) -VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h -VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c -endif -VP8_CX_SRCS-yes += encoder/temporal_filter.c -VP8_CX_SRCS-yes += encoder/temporal_filter.h -VP8_CX_SRCS-yes += encoder/mbgraph.c -VP8_CX_SRCS-yes += encoder/mbgraph.h - - -VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/mcomp_x86.h -VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_x86.h -VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/temporal_filter_x86.h -VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/x86_csystemdependent.c -VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_mmx.c -VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_impl_mmx.asm -VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/sad_mmx.asm -VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm -VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_sse2.c -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/variance_impl_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/sad_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/subtract_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE3) += encoder/x86/sad_sse3.asm -VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/sad_ssse3.asm -VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_ssse3.c -VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/variance_impl_ssse3.asm -VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3.asm -VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/sad_sse4.asm -VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.asm -VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm -VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm -VP8_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt.asm - - -VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes)) diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk deleted file mode 100644 index f8f054a76..000000000 --- a/vp8/vp8cx_arm.mk +++ /dev/null @@ -1,63 +0,0 @@ -## -## Copyright (c) 2010 The WebM project authors. All Rights Reserved. -## -## Use of this source code is governed by a BSD-style license -## that can be found in the LICENSE file in the root of the source -## tree. An additional intellectual property rights grant can be found -## in the file PATENTS. All contributing project authors may -## be found in the AUTHORS file in the root of the source tree. -## - - -#VP8_CX_SRCS list is modified according to different platforms. - -#File list for arm -# encoder -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/arm_csystemdependent.c - -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.h -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/encodemb_arm.h -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.h -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.h - -#File list for armv5te -# encoder -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/boolhuff_arm.c -VP8_CX_SRCS_REMOVE-$(HAVE_ARMV5TE) += encoder/boolhuff.c -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/boolhuff_armv5te$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_armv5$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_mbrow_armv5$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_partitions_armv5$(ASM) - -#File list for armv6 -# encoder -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_subtract_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_mse16x16_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance8x8_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/walsh_v6$(ASM) - -#File list for neon -# encoder -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/fastquantizeb_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/picklpf_arm.c -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad8_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad16_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/shortfdct_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/subtract_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/variance_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_mse16x16_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance8x8_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_memcpy_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_shortwalsh4x4_neon$(ASM) diff --git a/vp8/vp8dx.mk b/vp8/vp8dx.mk deleted file mode 100644 index 15895c529..000000000 --- a/vp8/vp8dx.mk +++ /dev/null @@ -1,71 +0,0 @@ -## -## Copyright (c) 2010 The WebM project authors. All Rights Reserved. -## -## Use of this source code is governed by a BSD-style license -## that can be found in the LICENSE file in the root of the source -## tree. An additional intellectual property rights grant can be found -## in the file PATENTS. All contributing project authors may -## be found in the AUTHORS file in the root of the source tree. -## - - -include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk - -VP8_DX_EXPORTS += exports_dec - -VP8_DX_SRCS-yes += $(VP8_COMMON_SRCS-yes) -VP8_DX_SRCS-no += $(VP8_COMMON_SRCS-no) -VP8_DX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes) -VP8_DX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no) - -ifeq ($(ARCH_ARM),yes) - include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8dx_arm.mk -endif - -VP8_DX_SRCS-yes += vp8_dx_iface.c - -# common -#define ARM -#define DISABLE_THREAD - -#INCLUDES += algo/vpx_common/vpx_mem/include -#INCLUDES += common -#INCLUDES += common -#INCLUDES += common -#INCLUDES += common -#INCLUDES += decoder - - - -# decoder -#define ARM -#define DISABLE_THREAD - -#INCLUDES += algo/vpx_common/vpx_mem/include -#INCLUDES += common -#INCLUDES += common -#INCLUDES += common -#INCLUDES += common -#INCLUDES += decoder - -VP8_DX_SRCS-yes += decoder/asm_dec_offsets.c -VP8_DX_SRCS-yes += decoder/dboolhuff.c -VP8_DX_SRCS-yes += decoder/decodemv.c -VP8_DX_SRCS-yes += decoder/decodframe.c -VP8_DX_SRCS-yes += decoder/dequantize.c -VP8_DX_SRCS-yes += decoder/detokenize.c -VP8_DX_SRCS-yes += decoder/dboolhuff.h -VP8_DX_SRCS-yes += decoder/decodemv.h -VP8_DX_SRCS-yes += decoder/dequantize.h -VP8_DX_SRCS-yes += decoder/detokenize.h -VP8_DX_SRCS-yes += decoder/onyxd_int.h -VP8_DX_SRCS-yes += decoder/treereader.h -VP8_DX_SRCS-yes += decoder/onyxd_if.c -VP8_DX_SRCS-yes += decoder/idct_blk.c - -VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes)) - -VP8_DX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += decoder/x86/x86_dsystemdependent.c -VP8_DX_SRCS-$(HAVE_MMX) += decoder/x86/dequantize_mmx.asm -VP8_DX_SRCS-$(HAVE_MMX) += decoder/x86/idct_blk_mmx.c -VP8_DX_SRCS-$(HAVE_SSE2) += decoder/x86/idct_blk_sse2.c diff --git a/vp8/common/alloccommon.c b/vp9/common/alloccommon.c similarity index 100% rename from vp8/common/alloccommon.c rename to vp9/common/alloccommon.c diff --git a/vp8/common/alloccommon.h b/vp9/common/alloccommon.h similarity index 100% rename from vp8/common/alloccommon.h rename to vp9/common/alloccommon.h diff --git a/vp8/common/arm/arm_systemdependent.c b/vp9/common/arm/arm_systemdependent.c similarity index 94% rename from vp8/common/arm/arm_systemdependent.c rename to vp9/common/arm/arm_systemdependent.c index 0147e24a9..19a01c69f 100644 --- a/vp8/common/arm/arm_systemdependent.c +++ b/vp9/common/arm/arm_systemdependent.c @@ -11,12 +11,12 @@ #include "vpx_ports/config.h" #include "vpx_ports/arm.h" -#include "vp8/common/pragmas.h" -#include "vp8/common/subpixel.h" -#include "vp8/common/loopfilter.h" -#include "vp8/common/recon.h" -#include "vp8/common/idct.h" -#include "vp8/common/onyxc_int.h" +#include "vp9/common/pragmas.h" +#include "vp9/common/subpixel.h" +#include "vp9/common/loopfilter.h" +#include "vp9/common/recon.h" +#include "vp9/common/idct.h" +#include "vp9/common/onyxc_int.h" void vp9_arch_arm_common_init(VP9_COMMON *ctx) { #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp8/common/arm/armv6/bilinearfilter_v6.asm b/vp9/common/arm/armv6/bilinearfilter_v6.asm similarity index 100% rename from vp8/common/arm/armv6/bilinearfilter_v6.asm rename to vp9/common/arm/armv6/bilinearfilter_v6.asm diff --git a/vp8/common/arm/armv6/copymem16x16_v6.asm b/vp9/common/arm/armv6/copymem16x16_v6.asm similarity index 100% rename from vp8/common/arm/armv6/copymem16x16_v6.asm rename to vp9/common/arm/armv6/copymem16x16_v6.asm diff --git a/vp8/common/arm/armv6/copymem8x4_v6.asm b/vp9/common/arm/armv6/copymem8x4_v6.asm similarity index 100% rename from vp8/common/arm/armv6/copymem8x4_v6.asm rename to vp9/common/arm/armv6/copymem8x4_v6.asm diff --git a/vp8/common/arm/armv6/copymem8x8_v6.asm b/vp9/common/arm/armv6/copymem8x8_v6.asm similarity index 100% rename from vp8/common/arm/armv6/copymem8x8_v6.asm rename to vp9/common/arm/armv6/copymem8x8_v6.asm diff --git a/vp8/common/arm/armv6/dc_only_idct_add_v6.asm b/vp9/common/arm/armv6/dc_only_idct_add_v6.asm similarity index 100% rename from vp8/common/arm/armv6/dc_only_idct_add_v6.asm rename to vp9/common/arm/armv6/dc_only_idct_add_v6.asm diff --git a/vp8/common/arm/armv6/filter_v6.asm b/vp9/common/arm/armv6/filter_v6.asm similarity index 100% rename from vp8/common/arm/armv6/filter_v6.asm rename to vp9/common/arm/armv6/filter_v6.asm diff --git a/vp8/common/arm/armv6/idct_v6.asm b/vp9/common/arm/armv6/idct_v6.asm similarity index 100% rename from vp8/common/arm/armv6/idct_v6.asm rename to vp9/common/arm/armv6/idct_v6.asm diff --git a/vp8/common/arm/armv6/iwalsh_v6.asm b/vp9/common/arm/armv6/iwalsh_v6.asm similarity index 100% rename from vp8/common/arm/armv6/iwalsh_v6.asm rename to vp9/common/arm/armv6/iwalsh_v6.asm diff --git a/vp8/common/arm/armv6/loopfilter_v6.asm b/vp9/common/arm/armv6/loopfilter_v6.asm similarity index 100% rename from vp8/common/arm/armv6/loopfilter_v6.asm rename to vp9/common/arm/armv6/loopfilter_v6.asm diff --git a/vp8/common/arm/armv6/recon_v6.asm b/vp9/common/arm/armv6/recon_v6.asm similarity index 100% rename from vp8/common/arm/armv6/recon_v6.asm rename to vp9/common/arm/armv6/recon_v6.asm diff --git a/vp8/common/arm/armv6/simpleloopfilter_v6.asm b/vp9/common/arm/armv6/simpleloopfilter_v6.asm similarity index 100% rename from vp8/common/arm/armv6/simpleloopfilter_v6.asm rename to vp9/common/arm/armv6/simpleloopfilter_v6.asm diff --git a/vp8/common/arm/armv6/sixtappredict8x4_v6.asm b/vp9/common/arm/armv6/sixtappredict8x4_v6.asm similarity index 100% rename from vp8/common/arm/armv6/sixtappredict8x4_v6.asm rename to vp9/common/arm/armv6/sixtappredict8x4_v6.asm diff --git a/vp8/common/arm/bilinearfilter_arm.c b/vp9/common/arm/bilinearfilter_arm.c similarity index 97% rename from vp8/common/arm/bilinearfilter_arm.c rename to vp9/common/arm/bilinearfilter_arm.c index 237952d3c..287fdf04d 100644 --- a/vp8/common/arm/bilinearfilter_arm.c +++ b/vp9/common/arm/bilinearfilter_arm.c @@ -10,8 +10,8 @@ #include -#include "vp8/common/filter.h" -#include "vp8/common/subpixel.h" +#include "vp9/common/filter.h" +#include "vp9/common/subpixel.h" #include "bilinearfilter_arm.h" void vp9_filter_block2d_bil_armv6 diff --git a/vp8/common/arm/bilinearfilter_arm.h b/vp9/common/arm/bilinearfilter_arm.h similarity index 100% rename from vp8/common/arm/bilinearfilter_arm.h rename to vp9/common/arm/bilinearfilter_arm.h diff --git a/vp8/common/arm/filter_arm.c b/vp9/common/arm/filter_arm.c similarity index 98% rename from vp8/common/arm/filter_arm.c rename to vp9/common/arm/filter_arm.c index 37a2a7460..ccb34e236 100644 --- a/vp8/common/arm/filter_arm.c +++ b/vp9/common/arm/filter_arm.c @@ -11,8 +11,8 @@ #include "vpx_ports/config.h" #include -#include "vp8/common/filter.h" -#include "vp8/common/subpixel.h" +#include "vp9/common/filter.h" +#include "vp9/common/subpixel.h" #include "vpx_ports/mem.h" extern void vp9_filter_block2d_first_pass_armv6 diff --git a/vp8/common/arm/idct_arm.h b/vp9/common/arm/idct_arm.h similarity index 100% rename from vp8/common/arm/idct_arm.h rename to vp9/common/arm/idct_arm.h diff --git a/vp8/common/arm/loopfilter_arm.c b/vp9/common/arm/loopfilter_arm.c similarity index 99% rename from vp8/common/arm/loopfilter_arm.c rename to vp9/common/arm/loopfilter_arm.c index 820eca2f2..abcb4c7cc 100644 --- a/vp8/common/arm/loopfilter_arm.c +++ b/vp9/common/arm/loopfilter_arm.c @@ -10,8 +10,8 @@ #include "vpx_config.h" -#include "vp8/common/loopfilter.h" -#include "vp8/common/onyxc_int.h" +#include "vp9/common/loopfilter.h" +#include "vp9/common/onyxc_int.h" #if HAVE_ARMV6 extern prototype_loopfilter(vp9_loop_filter_horizontal_edge_armv6); diff --git a/vp8/common/arm/loopfilter_arm.h b/vp9/common/arm/loopfilter_arm.h similarity index 100% rename from vp8/common/arm/loopfilter_arm.h rename to vp9/common/arm/loopfilter_arm.h diff --git a/vp8/common/arm/neon/bilinearpredict16x16_neon.asm b/vp9/common/arm/neon/bilinearpredict16x16_neon.asm similarity index 100% rename from vp8/common/arm/neon/bilinearpredict16x16_neon.asm rename to vp9/common/arm/neon/bilinearpredict16x16_neon.asm diff --git a/vp8/common/arm/neon/bilinearpredict4x4_neon.asm b/vp9/common/arm/neon/bilinearpredict4x4_neon.asm similarity index 100% rename from vp8/common/arm/neon/bilinearpredict4x4_neon.asm rename to vp9/common/arm/neon/bilinearpredict4x4_neon.asm diff --git a/vp8/common/arm/neon/bilinearpredict8x4_neon.asm b/vp9/common/arm/neon/bilinearpredict8x4_neon.asm similarity index 100% rename from vp8/common/arm/neon/bilinearpredict8x4_neon.asm rename to vp9/common/arm/neon/bilinearpredict8x4_neon.asm diff --git a/vp8/common/arm/neon/bilinearpredict8x8_neon.asm b/vp9/common/arm/neon/bilinearpredict8x8_neon.asm similarity index 100% rename from vp8/common/arm/neon/bilinearpredict8x8_neon.asm rename to vp9/common/arm/neon/bilinearpredict8x8_neon.asm diff --git a/vp8/common/arm/neon/buildintrapredictorsmby_neon.asm b/vp9/common/arm/neon/buildintrapredictorsmby_neon.asm similarity index 100% rename from vp8/common/arm/neon/buildintrapredictorsmby_neon.asm rename to vp9/common/arm/neon/buildintrapredictorsmby_neon.asm diff --git a/vp8/common/arm/neon/copymem16x16_neon.asm b/vp9/common/arm/neon/copymem16x16_neon.asm similarity index 100% rename from vp8/common/arm/neon/copymem16x16_neon.asm rename to vp9/common/arm/neon/copymem16x16_neon.asm diff --git a/vp8/common/arm/neon/copymem8x4_neon.asm b/vp9/common/arm/neon/copymem8x4_neon.asm similarity index 100% rename from vp8/common/arm/neon/copymem8x4_neon.asm rename to vp9/common/arm/neon/copymem8x4_neon.asm diff --git a/vp8/common/arm/neon/copymem8x8_neon.asm b/vp9/common/arm/neon/copymem8x8_neon.asm similarity index 100% rename from vp8/common/arm/neon/copymem8x8_neon.asm rename to vp9/common/arm/neon/copymem8x8_neon.asm diff --git a/vp8/common/arm/neon/dc_only_idct_add_neon.asm b/vp9/common/arm/neon/dc_only_idct_add_neon.asm similarity index 100% rename from vp8/common/arm/neon/dc_only_idct_add_neon.asm rename to vp9/common/arm/neon/dc_only_idct_add_neon.asm diff --git a/vp8/common/arm/neon/iwalsh_neon.asm b/vp9/common/arm/neon/iwalsh_neon.asm similarity index 100% rename from vp8/common/arm/neon/iwalsh_neon.asm rename to vp9/common/arm/neon/iwalsh_neon.asm diff --git a/vp8/common/arm/neon/loopfilter_neon.asm b/vp9/common/arm/neon/loopfilter_neon.asm similarity index 100% rename from vp8/common/arm/neon/loopfilter_neon.asm rename to vp9/common/arm/neon/loopfilter_neon.asm diff --git a/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm b/vp9/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm similarity index 100% rename from vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm rename to vp9/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm diff --git a/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.asm b/vp9/common/arm/neon/loopfiltersimpleverticaledge_neon.asm similarity index 100% rename from vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.asm rename to vp9/common/arm/neon/loopfiltersimpleverticaledge_neon.asm diff --git a/vp8/common/arm/neon/mbloopfilter_neon.asm b/vp9/common/arm/neon/mbloopfilter_neon.asm similarity index 100% rename from vp8/common/arm/neon/mbloopfilter_neon.asm rename to vp9/common/arm/neon/mbloopfilter_neon.asm diff --git a/vp8/common/arm/neon/recon16x16mb_neon.asm b/vp9/common/arm/neon/recon16x16mb_neon.asm similarity index 100% rename from vp8/common/arm/neon/recon16x16mb_neon.asm rename to vp9/common/arm/neon/recon16x16mb_neon.asm diff --git a/vp8/common/arm/neon/recon2b_neon.asm b/vp9/common/arm/neon/recon2b_neon.asm similarity index 100% rename from vp8/common/arm/neon/recon2b_neon.asm rename to vp9/common/arm/neon/recon2b_neon.asm diff --git a/vp8/common/arm/neon/recon4b_neon.asm b/vp9/common/arm/neon/recon4b_neon.asm similarity index 100% rename from vp8/common/arm/neon/recon4b_neon.asm rename to vp9/common/arm/neon/recon4b_neon.asm diff --git a/vp8/common/arm/neon/recon_neon.c b/vp9/common/arm/neon/recon_neon.c similarity index 94% rename from vp8/common/arm/neon/recon_neon.c rename to vp9/common/arm/neon/recon_neon.c index 510c87dbe..10fd46feb 100644 --- a/vp8/common/arm/neon/recon_neon.c +++ b/vp9/common/arm/neon/recon_neon.c @@ -10,8 +10,8 @@ #include "vpx_ports/config.h" -#include "vp8/common/recon.h" -#include "vp8/common/blockd.h" +#include "vp9/common/recon.h" +#include "vp9/common/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/vp8/common/arm/neon/reconb_neon.asm b/vp9/common/arm/neon/reconb_neon.asm similarity index 100% rename from vp8/common/arm/neon/reconb_neon.asm rename to vp9/common/arm/neon/reconb_neon.asm diff --git a/vp8/common/arm/neon/save_neon_reg.asm b/vp9/common/arm/neon/save_neon_reg.asm similarity index 100% rename from vp8/common/arm/neon/save_neon_reg.asm rename to vp9/common/arm/neon/save_neon_reg.asm diff --git a/vp8/common/arm/neon/shortidct4x4llm_1_neon.asm b/vp9/common/arm/neon/shortidct4x4llm_1_neon.asm similarity index 100% rename from vp8/common/arm/neon/shortidct4x4llm_1_neon.asm rename to vp9/common/arm/neon/shortidct4x4llm_1_neon.asm diff --git a/vp8/common/arm/neon/shortidct4x4llm_neon.asm b/vp9/common/arm/neon/shortidct4x4llm_neon.asm similarity index 100% rename from vp8/common/arm/neon/shortidct4x4llm_neon.asm rename to vp9/common/arm/neon/shortidct4x4llm_neon.asm diff --git a/vp8/common/arm/neon/sixtappredict16x16_neon.asm b/vp9/common/arm/neon/sixtappredict16x16_neon.asm similarity index 100% rename from vp8/common/arm/neon/sixtappredict16x16_neon.asm rename to vp9/common/arm/neon/sixtappredict16x16_neon.asm diff --git a/vp8/common/arm/neon/sixtappredict4x4_neon.asm b/vp9/common/arm/neon/sixtappredict4x4_neon.asm similarity index 100% rename from vp8/common/arm/neon/sixtappredict4x4_neon.asm rename to vp9/common/arm/neon/sixtappredict4x4_neon.asm diff --git a/vp8/common/arm/neon/sixtappredict8x4_neon.asm b/vp9/common/arm/neon/sixtappredict8x4_neon.asm similarity index 100% rename from vp8/common/arm/neon/sixtappredict8x4_neon.asm rename to vp9/common/arm/neon/sixtappredict8x4_neon.asm diff --git a/vp8/common/arm/neon/sixtappredict8x8_neon.asm b/vp9/common/arm/neon/sixtappredict8x8_neon.asm similarity index 100% rename from vp8/common/arm/neon/sixtappredict8x8_neon.asm rename to vp9/common/arm/neon/sixtappredict8x8_neon.asm diff --git a/vp8/common/arm/recon_arm.h b/vp9/common/arm/recon_arm.h similarity index 100% rename from vp8/common/arm/recon_arm.h rename to vp9/common/arm/recon_arm.h diff --git a/vp8/common/arm/reconintra_arm.c b/vp9/common/arm/reconintra_arm.c similarity index 94% rename from vp8/common/arm/reconintra_arm.c rename to vp9/common/arm/reconintra_arm.c index a44809b16..590254680 100644 --- a/vp8/common/arm/reconintra_arm.c +++ b/vp9/common/arm/reconintra_arm.c @@ -10,10 +10,10 @@ #include "vpx_ports/config.h" -#include "vp8/common/blockd.h" -#include "vp8/common/reconintra.h" +#include "vp9/common/blockd.h" +#include "vp9/common/reconintra.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/recon.h" +#include "vp9/common/recon.h" #if HAVE_ARMV7 extern void vp9_build_intra_predictors_mby_neon_func( diff --git a/vp8/common/arm/subpixel_arm.h b/vp9/common/arm/subpixel_arm.h similarity index 100% rename from vp8/common/arm/subpixel_arm.h rename to vp9/common/arm/subpixel_arm.h diff --git a/vp8/common/asm_com_offsets.c b/vp9/common/asm_com_offsets.c similarity index 100% rename from vp8/common/asm_com_offsets.c rename to vp9/common/asm_com_offsets.c diff --git a/vp8/common/blockd.c b/vp9/common/blockd.c similarity index 100% rename from vp8/common/blockd.c rename to vp9/common/blockd.c diff --git a/vp8/common/blockd.h b/vp9/common/blockd.h similarity index 100% rename from vp8/common/blockd.h rename to vp9/common/blockd.h diff --git a/vp8/common/coefupdateprobs.h b/vp9/common/coefupdateprobs.h similarity index 100% rename from vp8/common/coefupdateprobs.h rename to vp9/common/coefupdateprobs.h diff --git a/vp8/common/common.h b/vp9/common/common.h similarity index 100% rename from vp8/common/common.h rename to vp9/common/common.h diff --git a/vp8/common/common_types.h b/vp9/common/common_types.h similarity index 100% rename from vp8/common/common_types.h rename to vp9/common/common_types.h diff --git a/vp8/common/context.c b/vp9/common/context.c similarity index 100% rename from vp8/common/context.c rename to vp9/common/context.c diff --git a/vp8/common/debugmodes.c b/vp9/common/debugmodes.c similarity index 100% rename from vp8/common/debugmodes.c rename to vp9/common/debugmodes.c diff --git a/vp8/common/default_coef_probs.h b/vp9/common/default_coef_probs.h similarity index 100% rename from vp8/common/default_coef_probs.h rename to vp9/common/default_coef_probs.h diff --git a/vp8/common/entropy.c b/vp9/common/entropy.c similarity index 100% rename from vp8/common/entropy.c rename to vp9/common/entropy.c diff --git a/vp8/common/entropy.h b/vp9/common/entropy.h similarity index 100% rename from vp8/common/entropy.h rename to vp9/common/entropy.h diff --git a/vp8/common/entropymode.c b/vp9/common/entropymode.c similarity index 99% rename from vp8/common/entropymode.c rename to vp9/common/entropymode.c index f6921c732..5b265787c 100644 --- a/vp8/common/entropymode.c +++ b/vp9/common/entropymode.c @@ -454,7 +454,7 @@ void vp9_update_mode_context(VP9_COMMON *pc) { } #ifdef MODE_STATS -#include "vp8/common/modecont.h" +#include "vp9/common/modecont.h" void print_mode_contexts(VP9_COMMON *pc) { int j, i; printf("\n====================\n"); diff --git a/vp8/common/entropymode.h b/vp9/common/entropymode.h similarity index 100% rename from vp8/common/entropymode.h rename to vp9/common/entropymode.h diff --git a/vp8/common/entropymv.c b/vp9/common/entropymv.c similarity index 100% rename from vp8/common/entropymv.c rename to vp9/common/entropymv.c diff --git a/vp8/common/entropymv.h b/vp9/common/entropymv.h similarity index 100% rename from vp8/common/entropymv.h rename to vp9/common/entropymv.h diff --git a/vp8/common/extend.c b/vp9/common/extend.c similarity index 100% rename from vp8/common/extend.c rename to vp9/common/extend.c diff --git a/vp8/common/extend.h b/vp9/common/extend.h similarity index 100% rename from vp8/common/extend.h rename to vp9/common/extend.h diff --git a/vp8/common/filter.c b/vp9/common/filter.c similarity index 100% rename from vp8/common/filter.c rename to vp9/common/filter.c diff --git a/vp8/common/filter.h b/vp9/common/filter.h similarity index 100% rename from vp8/common/filter.h rename to vp9/common/filter.h diff --git a/vp8/common/findnearmv.c b/vp9/common/findnearmv.c similarity index 99% rename from vp8/common/findnearmv.c rename to vp9/common/findnearmv.c index a21fe6e0a..5270abf6a 100644 --- a/vp8/common/findnearmv.c +++ b/vp9/common/findnearmv.c @@ -10,7 +10,7 @@ #include "findnearmv.h" -#include "vp8/common/sadmxn.h" +#include "vp9/common/sadmxn.h" #include const unsigned char vp9_mbsplit_offset[4][16] = { diff --git a/vp8/common/findnearmv.h b/vp9/common/findnearmv.h similarity index 100% rename from vp8/common/findnearmv.h rename to vp9/common/findnearmv.h diff --git a/vp8/common/generic/systemdependent.c b/vp9/common/generic/systemdependent.c similarity index 94% rename from vp8/common/generic/systemdependent.c rename to vp9/common/generic/systemdependent.c index 8924f62aa..ed98d3006 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp9/common/generic/systemdependent.c @@ -11,10 +11,10 @@ #include "vpx_ports/config.h" #include "vpx_rtcd.h" -#include "vp8/common/subpixel.h" -#include "vp8/common/loopfilter.h" -#include "vp8/common/idct.h" -#include "vp8/common/onyxc_int.h" +#include "vp9/common/subpixel.h" +#include "vp9/common/loopfilter.h" +#include "vp9/common/idct.h" +#include "vp9/common/onyxc_int.h" extern void vp9_arch_x86_common_init(VP9_COMMON *ctx); extern void vp9_arch_arm_common_init(VP9_COMMON *ctx); @@ -63,7 +63,7 @@ void vp9_machine_specific_config(VP9_COMMON *ctx) { rtcd->subpix.bilinear4x4 = vp9_bilinear_predict4x4_c; rtcd->subpix.bilinear_avg4x4 = vp9_bilinear_predict_avg4x4_c; -#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_INTERNAL_STATS) +#if CONFIG_POSTPROC || (CONFIG_VP9_ENCODER && CONFIG_INTERNAL_STATS) rtcd->postproc.down = vp9_mbpost_proc_down_c; rtcd->postproc.across = vp9_mbpost_proc_across_ip_c; rtcd->postproc.downacross = vp9_post_proc_down_and_across_c; diff --git a/vp8/common/header.h b/vp9/common/header.h similarity index 100% rename from vp8/common/header.h rename to vp9/common/header.h diff --git a/vp8/common/idct.h b/vp9/common/idct.h similarity index 99% rename from vp8/common/idct.h rename to vp9/common/idct.h index ee6b0ba7f..cbe1169bc 100644 --- a/vp8/common/idct.h +++ b/vp9/common/idct.h @@ -12,7 +12,7 @@ #ifndef __INC_IDCT_H #define __INC_IDCT_H -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" #define prototype_second_order(sym) \ void sym(short *input, short *output) diff --git a/vp8/common/idctllm.c b/vp9/common/idctllm.c similarity index 99% rename from vp8/common/idctllm.c rename to vp9/common/idctllm.c index 9958f9508..becb6ef1f 100644 --- a/vp8/common/idctllm.c +++ b/vp9/common/idctllm.c @@ -25,10 +25,10 @@ #include #include #include "vpx_ports/config.h" -#include "vp8/common/idct.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/idct.h" +#include "vp9/common/systemdependent.h" -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" static const int cospi8sqrt2minus1 = 20091; static const int sinpi8sqrt2 = 35468; diff --git a/vp8/common/implicit_segmentation.c b/vp9/common/implicit_segmentation.c similarity index 99% rename from vp8/common/implicit_segmentation.c rename to vp9/common/implicit_segmentation.c index d9de6032a..9194e2a30 100644 --- a/vp8/common/implicit_segmentation.c +++ b/vp9/common/implicit_segmentation.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp8/common/onyxc_int.h" +#include "vp9/common/onyxc_int.h" #define MAX_REGIONS 24000 #ifndef NULL diff --git a/vp8/common/invtrans.c b/vp9/common/invtrans.c similarity index 100% rename from vp8/common/invtrans.c rename to vp9/common/invtrans.c diff --git a/vp8/common/invtrans.h b/vp9/common/invtrans.h similarity index 100% rename from vp8/common/invtrans.h rename to vp9/common/invtrans.h diff --git a/vp8/common/loopfilter.c b/vp9/common/loopfilter.c similarity index 99% rename from vp8/common/loopfilter.c rename to vp9/common/loopfilter.c index a2bf14d82..0d295c66a 100644 --- a/vp8/common/loopfilter.c +++ b/vp9/common/loopfilter.c @@ -13,7 +13,7 @@ #include "onyxc_int.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/seg_common.h" +#include "vp9/common/seg_common.h" static void lf_init_lut(loop_filter_info_n *lfi) { int filt_lvl; diff --git a/vp8/common/loopfilter.h b/vp9/common/loopfilter.h similarity index 100% rename from vp8/common/loopfilter.h rename to vp9/common/loopfilter.h diff --git a/vp8/common/loopfilter_filters.c b/vp9/common/loopfilter_filters.c similarity index 100% rename from vp8/common/loopfilter_filters.c rename to vp9/common/loopfilter_filters.c diff --git a/vp8/common/maskingmv.c b/vp9/common/maskingmv.c similarity index 100% rename from vp8/common/maskingmv.c rename to vp9/common/maskingmv.c diff --git a/vp8/common/mbpitch.c b/vp9/common/mbpitch.c similarity index 100% rename from vp8/common/mbpitch.c rename to vp9/common/mbpitch.c diff --git a/vp8/common/modecont.c b/vp9/common/modecont.c similarity index 100% rename from vp8/common/modecont.c rename to vp9/common/modecont.c diff --git a/vp8/common/modecont.h b/vp9/common/modecont.h similarity index 100% rename from vp8/common/modecont.h rename to vp9/common/modecont.h diff --git a/vp8/common/modecontext.c b/vp9/common/modecontext.c similarity index 100% rename from vp8/common/modecontext.c rename to vp9/common/modecontext.c diff --git a/vp8/common/mv.h b/vp9/common/mv.h similarity index 100% rename from vp8/common/mv.h rename to vp9/common/mv.h diff --git a/vp8/common/mvref_common.c b/vp9/common/mvref_common.c similarity index 100% rename from vp8/common/mvref_common.c rename to vp9/common/mvref_common.c diff --git a/vp8/common/mvref_common.h b/vp9/common/mvref_common.h similarity index 100% rename from vp8/common/mvref_common.h rename to vp9/common/mvref_common.h diff --git a/vp8/common/onyx.h b/vp9/common/onyx.h similarity index 100% rename from vp8/common/onyx.h rename to vp9/common/onyx.h diff --git a/vp8/common/onyxc_int.h b/vp9/common/onyxc_int.h similarity index 100% rename from vp8/common/onyxc_int.h rename to vp9/common/onyxc_int.h diff --git a/vp8/common/onyxd.h b/vp9/common/onyxd.h similarity index 100% rename from vp8/common/onyxd.h rename to vp9/common/onyxd.h diff --git a/vp8/common/postproc.c b/vp9/common/postproc.c similarity index 100% rename from vp8/common/postproc.c rename to vp9/common/postproc.c diff --git a/vp8/common/postproc.h b/vp9/common/postproc.h similarity index 100% rename from vp8/common/postproc.h rename to vp9/common/postproc.h diff --git a/vp8/common/ppc/copy_altivec.asm b/vp9/common/ppc/copy_altivec.asm similarity index 100% rename from vp8/common/ppc/copy_altivec.asm rename to vp9/common/ppc/copy_altivec.asm diff --git a/vp8/common/ppc/filter_altivec.asm b/vp9/common/ppc/filter_altivec.asm similarity index 100% rename from vp8/common/ppc/filter_altivec.asm rename to vp9/common/ppc/filter_altivec.asm diff --git a/vp8/common/ppc/filter_bilinear_altivec.asm b/vp9/common/ppc/filter_bilinear_altivec.asm similarity index 100% rename from vp8/common/ppc/filter_bilinear_altivec.asm rename to vp9/common/ppc/filter_bilinear_altivec.asm diff --git a/vp8/common/ppc/idctllm_altivec.asm b/vp9/common/ppc/idctllm_altivec.asm similarity index 100% rename from vp8/common/ppc/idctllm_altivec.asm rename to vp9/common/ppc/idctllm_altivec.asm diff --git a/vp8/common/ppc/loopfilter_altivec.c b/vp9/common/ppc/loopfilter_altivec.c similarity index 100% rename from vp8/common/ppc/loopfilter_altivec.c rename to vp9/common/ppc/loopfilter_altivec.c diff --git a/vp8/common/ppc/loopfilter_filters_altivec.asm b/vp9/common/ppc/loopfilter_filters_altivec.asm similarity index 100% rename from vp8/common/ppc/loopfilter_filters_altivec.asm rename to vp9/common/ppc/loopfilter_filters_altivec.asm diff --git a/vp8/common/ppc/platform_altivec.asm b/vp9/common/ppc/platform_altivec.asm similarity index 100% rename from vp8/common/ppc/platform_altivec.asm rename to vp9/common/ppc/platform_altivec.asm diff --git a/vp8/common/ppc/recon_altivec.asm b/vp9/common/ppc/recon_altivec.asm similarity index 100% rename from vp8/common/ppc/recon_altivec.asm rename to vp9/common/ppc/recon_altivec.asm diff --git a/vp8/common/ppc/systemdependent.c b/vp9/common/ppc/systemdependent.c similarity index 100% rename from vp8/common/ppc/systemdependent.c rename to vp9/common/ppc/systemdependent.c diff --git a/vp8/common/ppflags.h b/vp9/common/ppflags.h similarity index 100% rename from vp8/common/ppflags.h rename to vp9/common/ppflags.h diff --git a/vp8/common/pragmas.h b/vp9/common/pragmas.h similarity index 100% rename from vp8/common/pragmas.h rename to vp9/common/pragmas.h diff --git a/vp8/common/pred_common.c b/vp9/common/pred_common.c similarity index 99% rename from vp8/common/pred_common.c rename to vp9/common/pred_common.c index e1b93d3a3..cc165e061 100644 --- a/vp8/common/pred_common.c +++ b/vp9/common/pred_common.c @@ -9,8 +9,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp8/common/pred_common.h" -#include "vp8/common/seg_common.h" +#include "vp9/common/pred_common.h" +#include "vp9/common/seg_common.h" // TBD prediction functions for various bitstream signals diff --git a/vp8/common/pred_common.h b/vp9/common/pred_common.h similarity index 98% rename from vp8/common/pred_common.h rename to vp9/common/pred_common.h index 19782693a..33656f23a 100644 --- a/vp8/common/pred_common.h +++ b/vp9/common/pred_common.h @@ -10,7 +10,7 @@ #include "type_aliases.h" #include "onyxc_int.h" -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" #ifndef __INC_PRED_COMMON_H__ #define __INC_PRED_COMMON_H__ 1 diff --git a/vp8/common/quant_common.c b/vp9/common/quant_common.c similarity index 100% rename from vp8/common/quant_common.c rename to vp9/common/quant_common.c diff --git a/vp8/common/quant_common.h b/vp9/common/quant_common.h similarity index 100% rename from vp8/common/quant_common.h rename to vp9/common/quant_common.h diff --git a/vp8/common/recon.c b/vp9/common/recon.c similarity index 100% rename from vp8/common/recon.c rename to vp9/common/recon.c diff --git a/vp8/common/reconinter.c b/vp9/common/reconinter.c similarity index 100% rename from vp8/common/reconinter.c rename to vp9/common/reconinter.c diff --git a/vp8/common/reconinter.h b/vp9/common/reconinter.h similarity index 100% rename from vp8/common/reconinter.h rename to vp9/common/reconinter.h diff --git a/vp8/common/reconintra.c b/vp9/common/reconintra.c similarity index 100% rename from vp8/common/reconintra.c rename to vp9/common/reconintra.c diff --git a/vp8/common/reconintra.h b/vp9/common/reconintra.h similarity index 100% rename from vp8/common/reconintra.h rename to vp9/common/reconintra.h diff --git a/vp8/common/reconintra4x4.c b/vp9/common/reconintra4x4.c similarity index 100% rename from vp8/common/reconintra4x4.c rename to vp9/common/reconintra4x4.c diff --git a/vp8/common/reconintra4x4.h b/vp9/common/reconintra4x4.h similarity index 100% rename from vp8/common/reconintra4x4.h rename to vp9/common/reconintra4x4.h diff --git a/vp8/common/rtcd.c b/vp9/common/rtcd.c similarity index 100% rename from vp8/common/rtcd.c rename to vp9/common/rtcd.c diff --git a/vp8/common/rtcd_defs.sh b/vp9/common/rtcd_defs.sh similarity index 99% rename from vp8/common/rtcd_defs.sh rename to vp9/common/rtcd_defs.sh index 403966d72..ec68f50d0 100644 --- a/vp8/common/rtcd_defs.sh +++ b/vp9/common/rtcd_defs.sh @@ -230,7 +230,7 @@ fi # # Encoder functions below this point. # -if [ "$CONFIG_VP8_ENCODER" = "yes" ]; then +if [ "$CONFIG_VP9_ENCODER" = "yes" ]; then # variance diff --git a/vp8/common/sadmxn.h b/vp9/common/sadmxn.h similarity index 100% rename from vp8/common/sadmxn.h rename to vp9/common/sadmxn.h diff --git a/vp8/common/seg_common.c b/vp9/common/seg_common.c similarity index 99% rename from vp8/common/seg_common.c rename to vp9/common/seg_common.c index 0cc80b4d2..ac41b3cb4 100644 --- a/vp8/common/seg_common.c +++ b/vp9/common/seg_common.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp8/common/seg_common.h" +#include "vp9/common/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] = { QINDEX_BITS, 6, 4, 4, 6, 2 }; diff --git a/vp8/common/seg_common.h b/vp9/common/seg_common.h similarity index 98% rename from vp8/common/seg_common.h rename to vp9/common/seg_common.h index 438386aeb..58edf1612 100644 --- a/vp8/common/seg_common.h +++ b/vp9/common/seg_common.h @@ -10,7 +10,7 @@ #include "type_aliases.h" #include "onyxc_int.h" -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" #ifndef __INC_SEG_COMMON_H__ #define __INC_SEG_COMMON_H__ 1 diff --git a/vp8/common/setupintrarecon.c b/vp9/common/setupintrarecon.c similarity index 100% rename from vp8/common/setupintrarecon.c rename to vp9/common/setupintrarecon.c diff --git a/vp8/common/setupintrarecon.h b/vp9/common/setupintrarecon.h similarity index 100% rename from vp8/common/setupintrarecon.h rename to vp9/common/setupintrarecon.h diff --git a/vp8/common/subpixel.h b/vp9/common/subpixel.h similarity index 100% rename from vp8/common/subpixel.h rename to vp9/common/subpixel.h diff --git a/vp8/common/swapyv12buffer.c b/vp9/common/swapyv12buffer.c similarity index 100% rename from vp8/common/swapyv12buffer.c rename to vp9/common/swapyv12buffer.c diff --git a/vp8/common/swapyv12buffer.h b/vp9/common/swapyv12buffer.h similarity index 100% rename from vp8/common/swapyv12buffer.h rename to vp9/common/swapyv12buffer.h diff --git a/vp8/common/systemdependent.h b/vp9/common/systemdependent.h similarity index 100% rename from vp8/common/systemdependent.h rename to vp9/common/systemdependent.h diff --git a/vp8/common/tapify.py b/vp9/common/tapify.py similarity index 100% rename from vp8/common/tapify.py rename to vp9/common/tapify.py diff --git a/vp8/common/textblit.c b/vp9/common/textblit.c similarity index 100% rename from vp8/common/textblit.c rename to vp9/common/textblit.c diff --git a/vp8/common/treecoder.c b/vp9/common/treecoder.c similarity index 100% rename from vp8/common/treecoder.c rename to vp9/common/treecoder.c diff --git a/vp8/common/treecoder.h b/vp9/common/treecoder.h similarity index 100% rename from vp8/common/treecoder.h rename to vp9/common/treecoder.h diff --git a/vp8/common/type_aliases.h b/vp9/common/type_aliases.h similarity index 100% rename from vp8/common/type_aliases.h rename to vp9/common/type_aliases.h diff --git a/vp8/common/x86/filter_sse2.c b/vp9/common/x86/filter_sse2.c similarity index 99% rename from vp8/common/x86/filter_sse2.c rename to vp9/common/x86/filter_sse2.c index 21845ff5a..400b3b4f7 100644 --- a/vp8/common/x86/filter_sse2.c +++ b/vp9/common/x86/filter_sse2.c @@ -10,7 +10,7 @@ #include // for alignment checks #include // SSE2 -#include "vp8/common/filter.h" +#include "vp9/common/filter.h" #include "vpx_ports/mem.h" // for DECLARE_ALIGNED #include "vpx_rtcd.h" diff --git a/vp8/common/x86/filter_sse4.c b/vp9/common/x86/filter_sse4.c similarity index 99% rename from vp8/common/x86/filter_sse4.c rename to vp9/common/x86/filter_sse4.c index ad753b9c9..ac2c92ce4 100644 --- a/vp8/common/x86/filter_sse4.c +++ b/vp9/common/x86/filter_sse4.c @@ -10,7 +10,7 @@ #include // for alignment checks #include // SSE4.1 -#include "vp8/common/filter.h" +#include "vp9/common/filter.h" #include "vpx_ports/mem.h" // for DECLARE_ALIGNED #include "vpx_rtcd.h" diff --git a/vp8/common/x86/idct_x86.h b/vp9/common/x86/idct_x86.h similarity index 100% rename from vp8/common/x86/idct_x86.h rename to vp9/common/x86/idct_x86.h diff --git a/vp8/common/x86/idctllm_mmx.asm b/vp9/common/x86/idctllm_mmx.asm similarity index 100% rename from vp8/common/x86/idctllm_mmx.asm rename to vp9/common/x86/idctllm_mmx.asm diff --git a/vp8/common/x86/idctllm_sse2.asm b/vp9/common/x86/idctllm_sse2.asm similarity index 100% rename from vp8/common/x86/idctllm_sse2.asm rename to vp9/common/x86/idctllm_sse2.asm diff --git a/vp8/common/x86/iwalsh_mmx.asm b/vp9/common/x86/iwalsh_mmx.asm similarity index 100% rename from vp8/common/x86/iwalsh_mmx.asm rename to vp9/common/x86/iwalsh_mmx.asm diff --git a/vp8/common/x86/iwalsh_sse2.asm b/vp9/common/x86/iwalsh_sse2.asm similarity index 100% rename from vp8/common/x86/iwalsh_sse2.asm rename to vp9/common/x86/iwalsh_sse2.asm diff --git a/vp8/common/x86/loopfilter_mmx.asm b/vp9/common/x86/loopfilter_mmx.asm similarity index 100% rename from vp8/common/x86/loopfilter_mmx.asm rename to vp9/common/x86/loopfilter_mmx.asm diff --git a/vp8/common/x86/loopfilter_sse2.asm b/vp9/common/x86/loopfilter_sse2.asm similarity index 100% rename from vp8/common/x86/loopfilter_sse2.asm rename to vp9/common/x86/loopfilter_sse2.asm diff --git a/vp8/common/x86/loopfilter_x86.c b/vp9/common/x86/loopfilter_x86.c similarity index 99% rename from vp8/common/x86/loopfilter_x86.c rename to vp9/common/x86/loopfilter_x86.c index faf857740..6aeddd387 100644 --- a/vp8/common/x86/loopfilter_x86.c +++ b/vp9/common/x86/loopfilter_x86.c @@ -10,7 +10,7 @@ #include // SSE2 #include "vpx_config.h" -#include "vp8/common/loopfilter.h" +#include "vp9/common/loopfilter.h" prototype_loopfilter(vp9_loop_filter_vertical_edge_mmx); prototype_loopfilter(vp9_loop_filter_horizontal_edge_mmx); diff --git a/vp8/common/x86/loopfilter_x86.h b/vp9/common/x86/loopfilter_x86.h similarity index 100% rename from vp8/common/x86/loopfilter_x86.h rename to vp9/common/x86/loopfilter_x86.h diff --git a/vp8/common/x86/mask_sse3.asm b/vp9/common/x86/mask_sse3.asm similarity index 100% rename from vp8/common/x86/mask_sse3.asm rename to vp9/common/x86/mask_sse3.asm diff --git a/vp8/common/x86/postproc_mmx.asm b/vp9/common/x86/postproc_mmx.asm similarity index 100% rename from vp8/common/x86/postproc_mmx.asm rename to vp9/common/x86/postproc_mmx.asm diff --git a/vp8/common/x86/postproc_sse2.asm b/vp9/common/x86/postproc_sse2.asm similarity index 100% rename from vp8/common/x86/postproc_sse2.asm rename to vp9/common/x86/postproc_sse2.asm diff --git a/vp8/common/x86/postproc_x86.h b/vp9/common/x86/postproc_x86.h similarity index 100% rename from vp8/common/x86/postproc_x86.h rename to vp9/common/x86/postproc_x86.h diff --git a/vp8/common/x86/recon_mmx.asm b/vp9/common/x86/recon_mmx.asm similarity index 100% rename from vp8/common/x86/recon_mmx.asm rename to vp9/common/x86/recon_mmx.asm diff --git a/vp8/common/x86/recon_sse2.asm b/vp9/common/x86/recon_sse2.asm similarity index 100% rename from vp8/common/x86/recon_sse2.asm rename to vp9/common/x86/recon_sse2.asm diff --git a/vp8/common/x86/recon_wrapper_sse2.c b/vp9/common/x86/recon_wrapper_sse2.c similarity index 99% rename from vp8/common/x86/recon_wrapper_sse2.c rename to vp9/common/x86/recon_wrapper_sse2.c index 9ee8087fe..d20e13871 100644 --- a/vp8/common/x86/recon_wrapper_sse2.c +++ b/vp9/common/x86/recon_wrapper_sse2.c @@ -10,7 +10,7 @@ #include "vpx_ports/config.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" #define build_intra_predictors_mbuv_prototype(sym) \ void sym(unsigned char *dst, int dst_stride, \ diff --git a/vp8/common/x86/sadmxn_x86.c b/vp9/common/x86/sadmxn_x86.c similarity index 100% rename from vp8/common/x86/sadmxn_x86.c rename to vp9/common/x86/sadmxn_x86.c diff --git a/vp8/common/x86/subpixel_8t_ssse3.asm b/vp9/common/x86/subpixel_8t_ssse3.asm similarity index 100% rename from vp8/common/x86/subpixel_8t_ssse3.asm rename to vp9/common/x86/subpixel_8t_ssse3.asm diff --git a/vp8/common/x86/subpixel_mmx.asm b/vp9/common/x86/subpixel_mmx.asm similarity index 100% rename from vp8/common/x86/subpixel_mmx.asm rename to vp9/common/x86/subpixel_mmx.asm diff --git a/vp8/common/x86/subpixel_sse2.asm b/vp9/common/x86/subpixel_sse2.asm similarity index 100% rename from vp8/common/x86/subpixel_sse2.asm rename to vp9/common/x86/subpixel_sse2.asm diff --git a/vp8/common/x86/subpixel_ssse3.asm b/vp9/common/x86/subpixel_ssse3.asm similarity index 100% rename from vp8/common/x86/subpixel_ssse3.asm rename to vp9/common/x86/subpixel_ssse3.asm diff --git a/vp8/common/x86/subpixel_x86.h b/vp9/common/x86/subpixel_x86.h similarity index 100% rename from vp8/common/x86/subpixel_x86.h rename to vp9/common/x86/subpixel_x86.h diff --git a/vp8/common/x86/vp8_asm_stubs.c b/vp9/common/x86/vp8_asm_stubs.c similarity index 99% rename from vp8/common/x86/vp8_asm_stubs.c rename to vp9/common/x86/vp8_asm_stubs.c index 671e05b18..817a93e24 100644 --- a/vp8/common/x86/vp8_asm_stubs.c +++ b/vp9/common/x86/vp8_asm_stubs.c @@ -11,7 +11,7 @@ #include "vpx_ports/config.h" #include "vpx_ports/mem.h" -#include "vp8/common/subpixel.h" +#include "vp9/common/subpixel.h" extern const short vp9_six_tap_mmx[16][6 * 8]; diff --git a/vp8/common/x86/x86_systemdependent.c b/vp9/common/x86/x86_systemdependent.c similarity index 95% rename from vp8/common/x86/x86_systemdependent.c rename to vp9/common/x86/x86_systemdependent.c index e814755b6..6e8e9add8 100644 --- a/vp8/common/x86/x86_systemdependent.c +++ b/vp9/common/x86/x86_systemdependent.c @@ -10,11 +10,11 @@ #include "vpx_config.h" #include "vpx_ports/x86.h" -#include "vp8/common/subpixel.h" -#include "vp8/common/loopfilter.h" -#include "vp8/common/idct.h" -#include "vp8/common/pragmas.h" -#include "vp8/common/onyxc_int.h" +#include "vp9/common/subpixel.h" +#include "vp9/common/loopfilter.h" +#include "vp9/common/idct.h" +#include "vp9/common/pragmas.h" +#include "vp9/common/onyxc_int.h" void vp9_arch_x86_common_init(VP9_COMMON *ctx) { #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp8/decoder/arm/armv6/dequant_dc_idct_v6.asm b/vp9/decoder/arm/armv6/dequant_dc_idct_v6.asm similarity index 100% rename from vp8/decoder/arm/armv6/dequant_dc_idct_v6.asm rename to vp9/decoder/arm/armv6/dequant_dc_idct_v6.asm diff --git a/vp8/decoder/arm/armv6/dequant_idct_v6.asm b/vp9/decoder/arm/armv6/dequant_idct_v6.asm similarity index 100% rename from vp8/decoder/arm/armv6/dequant_idct_v6.asm rename to vp9/decoder/arm/armv6/dequant_idct_v6.asm diff --git a/vp8/decoder/arm/armv6/dequantize_v6.asm b/vp9/decoder/arm/armv6/dequantize_v6.asm similarity index 100% rename from vp8/decoder/arm/armv6/dequantize_v6.asm rename to vp9/decoder/arm/armv6/dequantize_v6.asm diff --git a/vp8/decoder/arm/armv6/idct_blk_v6.c b/vp9/decoder/arm/armv6/idct_blk_v6.c similarity index 98% rename from vp8/decoder/arm/armv6/idct_blk_v6.c rename to vp9/decoder/arm/armv6/idct_blk_v6.c index 20bb86971..fe9b9035e 100644 --- a/vp8/decoder/arm/armv6/idct_blk_v6.c +++ b/vp9/decoder/arm/armv6/idct_blk_v6.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "vp8/common/idct.h" -#include "vp8/decoder/dequantize.h" +#include "vp9/common/idct.h" +#include "vp9/decoder/dequantize.h" void vp8_dequant_dc_idct_add_y_block_v6 (short *q, short *dq, unsigned char *pre, diff --git a/vp8/decoder/arm/dequantize_arm.c b/vp9/decoder/arm/dequantize_arm.c similarity index 94% rename from vp8/decoder/arm/dequantize_arm.c rename to vp9/decoder/arm/dequantize_arm.c index 48c8f7741..cc2ff313a 100644 --- a/vp8/decoder/arm/dequantize_arm.c +++ b/vp9/decoder/arm/dequantize_arm.c @@ -10,8 +10,8 @@ #include "vpx_ports/config.h" -#include "vp8/decoder/dequantize.h" -#include "vp8/common/idct.h" +#include "vp9/decoder/dequantize.h" +#include "vp9/common/idct.h" #include "vpx_mem/vpx_mem.h" #if HAVE_ARMV7 diff --git a/vp8/decoder/arm/neon/dequant_idct_neon.asm b/vp9/decoder/arm/neon/dequant_idct_neon.asm similarity index 100% rename from vp8/decoder/arm/neon/dequant_idct_neon.asm rename to vp9/decoder/arm/neon/dequant_idct_neon.asm diff --git a/vp8/decoder/arm/neon/dequantizeb_neon.asm b/vp9/decoder/arm/neon/dequantizeb_neon.asm similarity index 100% rename from vp8/decoder/arm/neon/dequantizeb_neon.asm rename to vp9/decoder/arm/neon/dequantizeb_neon.asm diff --git a/vp8/decoder/arm/neon/idct_blk_neon.c b/vp9/decoder/arm/neon/idct_blk_neon.c similarity index 97% rename from vp8/decoder/arm/neon/idct_blk_neon.c rename to vp9/decoder/arm/neon/idct_blk_neon.c index 2e494f0b9..fb5d298df 100644 --- a/vp8/decoder/arm/neon/idct_blk_neon.c +++ b/vp9/decoder/arm/neon/idct_blk_neon.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "vp8/common/idct.h" -#include "vp8/decoder/dequantize.h" +#include "vp9/common/idct.h" +#include "vp9/decoder/dequantize.h" /* place these declarations here because we don't want to maintain them * outside of this scope diff --git a/vp8/decoder/arm/neon/idct_dequant_0_2x_neon.asm b/vp9/decoder/arm/neon/idct_dequant_0_2x_neon.asm similarity index 100% rename from vp8/decoder/arm/neon/idct_dequant_0_2x_neon.asm rename to vp9/decoder/arm/neon/idct_dequant_0_2x_neon.asm diff --git a/vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm b/vp9/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm similarity index 100% rename from vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm rename to vp9/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm diff --git a/vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm b/vp9/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm similarity index 100% rename from vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm rename to vp9/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm diff --git a/vp8/decoder/arm/neon/idct_dequant_full_2x_neon.asm b/vp9/decoder/arm/neon/idct_dequant_full_2x_neon.asm similarity index 100% rename from vp8/decoder/arm/neon/idct_dequant_full_2x_neon.asm rename to vp9/decoder/arm/neon/idct_dequant_full_2x_neon.asm diff --git a/vp8/decoder/asm_dec_offsets.c b/vp9/decoder/asm_dec_offsets.c similarity index 100% rename from vp8/decoder/asm_dec_offsets.c rename to vp9/decoder/asm_dec_offsets.c diff --git a/vp8/decoder/dboolhuff.c b/vp9/decoder/dboolhuff.c similarity index 100% rename from vp8/decoder/dboolhuff.c rename to vp9/decoder/dboolhuff.c diff --git a/vp8/decoder/dboolhuff.h b/vp9/decoder/dboolhuff.h similarity index 100% rename from vp8/decoder/dboolhuff.h rename to vp9/decoder/dboolhuff.h diff --git a/vp8/decoder/decodemv.c b/vp9/decoder/decodemv.c similarity index 99% rename from vp8/decoder/decodemv.c rename to vp9/decoder/decodemv.c index 513079785..c4ff898e8 100644 --- a/vp8/decoder/decodemv.c +++ b/vp9/decoder/decodemv.c @@ -10,15 +10,15 @@ #include "treereader.h" -#include "vp8/common/entropymv.h" -#include "vp8/common/entropymode.h" +#include "vp9/common/entropymv.h" +#include "vp9/common/entropymode.h" #include "onyxd_int.h" -#include "vp8/common/findnearmv.h" +#include "vp9/common/findnearmv.h" -#include "vp8/common/seg_common.h" -#include "vp8/common/pred_common.h" -#include "vp8/common/entropy.h" -#include "vp8/decoder/decodemv.h" +#include "vp9/common/seg_common.h" +#include "vp9/common/pred_common.h" +#include "vp9/common/entropy.h" +#include "vp9/decoder/decodemv.h" #if CONFIG_DEBUG #include #endif diff --git a/vp8/decoder/decodemv.h b/vp9/decoder/decodemv.h similarity index 100% rename from vp8/decoder/decodemv.h rename to vp9/decoder/decodemv.h diff --git a/vp8/decoder/decodframe.c b/vp9/decoder/decodframe.c similarity index 98% rename from vp8/decoder/decodframe.c rename to vp9/decoder/decodframe.c index dee3b5989..0499eeb9d 100644 --- a/vp8/decoder/decodframe.c +++ b/vp9/decoder/decodframe.c @@ -10,28 +10,28 @@ #include "onyxd_int.h" -#include "vp8/common/header.h" -#include "vp8/common/reconintra.h" -#include "vp8/common/reconintra4x4.h" -#include "vp8/common/reconinter.h" +#include "vp9/common/header.h" +#include "vp9/common/reconintra.h" +#include "vp9/common/reconintra4x4.h" +#include "vp9/common/reconinter.h" #include "detokenize.h" -#include "vp8/common/invtrans.h" -#include "vp8/common/alloccommon.h" -#include "vp8/common/entropymode.h" -#include "vp8/common/quant_common.h" +#include "vp9/common/invtrans.h" +#include "vp9/common/alloccommon.h" +#include "vp9/common/entropymode.h" +#include "vp9/common/quant_common.h" #include "vpx_scale/vpxscale.h" #include "vpx_scale/yv12extend.h" -#include "vp8/common/setupintrarecon.h" +#include "vp9/common/setupintrarecon.h" #include "decodemv.h" -#include "vp8/common/extend.h" -#include "vp8/common/modecont.h" +#include "vp9/common/extend.h" +#include "vp9/common/modecont.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/idct.h" +#include "vp9/common/idct.h" #include "dboolhuff.h" -#include "vp8/common/seg_common.h" -#include "vp8/common/entropy.h" +#include "vp9/common/seg_common.h" +#include "vp9/common/entropy.h" #include "vpx_rtcd.h" #include diff --git a/vp8/decoder/dequantize.c b/vp9/decoder/dequantize.c similarity index 99% rename from vp8/decoder/dequantize.c rename to vp9/decoder/dequantize.c index 2f0a6343a..508aaef5a 100644 --- a/vp8/decoder/dequantize.c +++ b/vp9/decoder/dequantize.c @@ -11,7 +11,7 @@ #include "vpx_ports/config.h" #include "dequantize.h" -#include "vp8/common/idct.h" +#include "vp9/common/idct.h" #include "vpx_mem/vpx_mem.h" #include "onyxd_int.h" diff --git a/vp8/decoder/dequantize.h b/vp9/decoder/dequantize.h similarity index 99% rename from vp8/decoder/dequantize.h rename to vp9/decoder/dequantize.h index 8b2f578d9..912061f28 100644 --- a/vp8/decoder/dequantize.h +++ b/vp9/decoder/dequantize.h @@ -11,7 +11,7 @@ #ifndef DEQUANTIZE_H #define DEQUANTIZE_H -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" #if CONFIG_LOSSLESS extern void vp9_dequant_idct_add_lossless_c(short *input, short *dq, diff --git a/vp8/decoder/detokenize.c b/vp9/decoder/detokenize.c similarity index 99% rename from vp8/decoder/detokenize.c rename to vp9/decoder/detokenize.c index 41dbf0e98..58f5044ea 100644 --- a/vp8/decoder/detokenize.c +++ b/vp9/decoder/detokenize.c @@ -9,14 +9,14 @@ */ -#include "vp8/common/type_aliases.h" -#include "vp8/common/blockd.h" +#include "vp9/common/type_aliases.h" +#include "vp9/common/blockd.h" #include "onyxd_int.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h" #include "detokenize.h" -#include "vp8/common/seg_common.h" +#include "vp9/common/seg_common.h" #define BOOL_DATA UINT8 diff --git a/vp8/decoder/detokenize.h b/vp9/decoder/detokenize.h similarity index 100% rename from vp8/decoder/detokenize.h rename to vp9/decoder/detokenize.h diff --git a/vp8/decoder/idct_blk.c b/vp9/decoder/idct_blk.c similarity index 99% rename from vp8/decoder/idct_blk.c rename to vp9/decoder/idct_blk.c index fd123b995..e9605fc96 100644 --- a/vp8/decoder/idct_blk.c +++ b/vp9/decoder/idct_blk.c @@ -9,7 +9,7 @@ */ #include "vpx_ports/config.h" -#include "vp8/common/idct.h" +#include "vp9/common/idct.h" #include "dequantize.h" void vp9_dequant_dc_idct_add_c(short *input, short *dq, unsigned char *pred, diff --git a/vp8/decoder/onyxd_if.c b/vp9/decoder/onyxd_if.c similarity index 97% rename from vp8/decoder/onyxd_if.c rename to vp9/decoder/onyxd_if.c index c1630b008..3364856a6 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp9/decoder/onyxd_if.c @@ -9,23 +9,23 @@ */ -#include "vp8/common/onyxc_int.h" +#include "vp9/common/onyxc_int.h" #if CONFIG_POSTPROC -#include "vp8/common/postproc.h" +#include "vp9/common/postproc.h" #endif -#include "vp8/common/onyxd.h" +#include "vp9/common/onyxd.h" #include "onyxd_int.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/alloccommon.h" +#include "vp9/common/alloccommon.h" #include "vpx_scale/yv12extend.h" -#include "vp8/common/loopfilter.h" -#include "vp8/common/swapyv12buffer.h" +#include "vp9/common/loopfilter.h" +#include "vp9/common/swapyv12buffer.h" #include #include -#include "vp8/common/quant_common.h" +#include "vp9/common/quant_common.h" #include "vpx_scale/vpxscale.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/systemdependent.h" #include "vpx_ports/vpx_timer.h" #include "detokenize.h" #if ARCH_ARM diff --git a/vp8/decoder/onyxd_int.h b/vp9/decoder/onyxd_int.h similarity index 97% rename from vp8/decoder/onyxd_int.h rename to vp9/decoder/onyxd_int.h index 2fb9e90b8..2684c0448 100644 --- a/vp8/decoder/onyxd_int.h +++ b/vp9/decoder/onyxd_int.h @@ -12,9 +12,9 @@ #ifndef __INC_ONYXD_INT_H #define __INC_ONYXD_INT_H #include "vpx_ports/config.h" -#include "vp8/common/onyxd.h" +#include "vp9/common/onyxd.h" #include "treereader.h" -#include "vp8/common/onyxc_int.h" +#include "vp9/common/onyxc_int.h" #include "dequantize.h" // #define DEC_DEBUG diff --git a/vp8/decoder/reconintra_mt.h b/vp9/decoder/reconintra_mt.h similarity index 100% rename from vp8/decoder/reconintra_mt.h rename to vp9/decoder/reconintra_mt.h diff --git a/vp8/decoder/treereader.h b/vp9/decoder/treereader.h similarity index 96% rename from vp8/decoder/treereader.h rename to vp9/decoder/treereader.h index ecd007a0f..931a6405c 100644 --- a/vp8/decoder/treereader.h +++ b/vp9/decoder/treereader.h @@ -12,7 +12,7 @@ #ifndef tree_reader_h #define tree_reader_h 1 -#include "vp8/common/treecoder.h" +#include "vp9/common/treecoder.h" #include "dboolhuff.h" diff --git a/vp8/decoder/x86/dequantize_mmx.asm b/vp9/decoder/x86/dequantize_mmx.asm similarity index 100% rename from vp8/decoder/x86/dequantize_mmx.asm rename to vp9/decoder/x86/dequantize_mmx.asm diff --git a/vp8/decoder/x86/idct_blk_mmx.c b/vp9/decoder/x86/idct_blk_mmx.c similarity index 98% rename from vp8/decoder/x86/idct_blk_mmx.c rename to vp9/decoder/x86/idct_blk_mmx.c index 971b80cc6..189a846de 100644 --- a/vp8/decoder/x86/idct_blk_mmx.c +++ b/vp9/decoder/x86/idct_blk_mmx.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "vp8/common/idct.h" -#include "vp8/decoder/dequantize.h" +#include "vp9/common/idct.h" +#include "vp9/decoder/dequantize.h" void vp9_dequant_dc_idct_add_y_block_mmx(short *q, short *dq, unsigned char *pre, diff --git a/vp8/decoder/x86/idct_blk_sse2.c b/vp9/decoder/x86/idct_blk_sse2.c similarity index 98% rename from vp8/decoder/x86/idct_blk_sse2.c rename to vp9/decoder/x86/idct_blk_sse2.c index dbda3ee8b..bc3c5d663 100644 --- a/vp8/decoder/x86/idct_blk_sse2.c +++ b/vp9/decoder/x86/idct_blk_sse2.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "vp8/common/idct.h" -#include "vp8/decoder/dequantize.h" +#include "vp9/common/idct.h" +#include "vp9/decoder/dequantize.h" void vp9_idct_dequant_dc_0_2x_sse2(short *q, short *dq, unsigned char *pre, unsigned char *dst, diff --git a/vp8/decoder/x86/x86_dsystemdependent.c b/vp9/decoder/x86/x86_dsystemdependent.c similarity index 95% rename from vp8/decoder/x86/x86_dsystemdependent.c rename to vp9/decoder/x86/x86_dsystemdependent.c index 19c03659a..35d2f9732 100644 --- a/vp8/decoder/x86/x86_dsystemdependent.c +++ b/vp9/decoder/x86/x86_dsystemdependent.c @@ -10,7 +10,7 @@ #include "vpx_ports/config.h" #include "vpx_ports/x86.h" -#include "vp8/decoder/onyxd_int.h" +#include "vp9/decoder/onyxd_int.h" #if HAVE_MMX void vp9_dequantize_b_impl_mmx(short *sq, short *dq, short *q); diff --git a/vp8/encoder/arm/arm_csystemdependent.c b/vp9/encoder/arm/arm_csystemdependent.c similarity index 98% rename from vp8/encoder/arm/arm_csystemdependent.c rename to vp9/encoder/arm/arm_csystemdependent.c index 1a93bc3e5..99129de98 100644 --- a/vp8/encoder/arm/arm_csystemdependent.c +++ b/vp9/encoder/arm/arm_csystemdependent.c @@ -11,8 +11,8 @@ #include "vpx_ports/config.h" #include "vpx_ports/arm.h" -#include "vp8/encoder/variance.h" -#include "vp8/encoder/onyx_int.h" +#include "vp9/encoder/variance.h" +#include "vp9/encoder/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/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm b/vp9/encoder/arm/armv5te/boolhuff_armv5te.asm similarity index 100% rename from vp8/encoder/arm/armv5te/boolhuff_armv5te.asm rename to vp9/encoder/arm/armv5te/boolhuff_armv5te.asm diff --git a/vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm b/vp9/encoder/arm/armv5te/vp8_packtokens_armv5.asm similarity index 100% rename from vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm rename to vp9/encoder/arm/armv5te/vp8_packtokens_armv5.asm diff --git a/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm b/vp9/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm similarity index 100% rename from vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm rename to vp9/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm diff --git a/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm b/vp9/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm similarity index 100% rename from vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm rename to vp9/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm diff --git a/vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm b/vp9/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm rename to vp9/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm b/vp9/encoder/arm/armv6/vp8_mse16x16_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm rename to vp9/encoder/arm/armv6/vp8_mse16x16_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm b/vp9/encoder/arm/armv6/vp8_sad16x16_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_sad16x16_armv6.asm rename to vp9/encoder/arm/armv6/vp8_sad16x16_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm b/vp9/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm rename to vp9/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_subtract_armv6.asm b/vp9/encoder/arm/armv6/vp8_subtract_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_subtract_armv6.asm rename to vp9/encoder/arm/armv6/vp8_subtract_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm b/vp9/encoder/arm/armv6/vp8_variance16x16_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_variance16x16_armv6.asm rename to vp9/encoder/arm/armv6/vp8_variance16x16_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm b/vp9/encoder/arm/armv6/vp8_variance8x8_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_variance8x8_armv6.asm rename to vp9/encoder/arm/armv6/vp8_variance8x8_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm b/vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm rename to vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm b/vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm rename to vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm diff --git a/vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm b/vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm similarity index 100% rename from vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm rename to vp9/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm diff --git a/vp8/encoder/arm/armv6/walsh_v6.asm b/vp9/encoder/arm/armv6/walsh_v6.asm similarity index 100% rename from vp8/encoder/arm/armv6/walsh_v6.asm rename to vp9/encoder/arm/armv6/walsh_v6.asm diff --git a/vp8/encoder/arm/boolhuff_arm.c b/vp9/encoder/arm/boolhuff_arm.c similarity index 96% rename from vp8/encoder/arm/boolhuff_arm.c rename to vp9/encoder/arm/boolhuff_arm.c index bc6fb4700..49cc6d63b 100644 --- a/vp8/encoder/arm/boolhuff_arm.c +++ b/vp9/encoder/arm/boolhuff_arm.c @@ -9,8 +9,8 @@ */ -#include "vp8/encoder/boolhuff.h" -#include "vp8/common/blockd.h" +#include "vp9/encoder/boolhuff.h" +#include "vp9/common/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/vp8/encoder/arm/dct_arm.c b/vp9/encoder/arm/dct_arm.c similarity index 100% rename from vp8/encoder/arm/dct_arm.c rename to vp9/encoder/arm/dct_arm.c diff --git a/vp8/encoder/arm/dct_arm.h b/vp9/encoder/arm/dct_arm.h similarity index 100% rename from vp8/encoder/arm/dct_arm.h rename to vp9/encoder/arm/dct_arm.h diff --git a/vp8/encoder/arm/encodemb_arm.h b/vp9/encoder/arm/encodemb_arm.h similarity index 100% rename from vp8/encoder/arm/encodemb_arm.h rename to vp9/encoder/arm/encodemb_arm.h diff --git a/vp8/encoder/arm/neon/fastquantizeb_neon.asm b/vp9/encoder/arm/neon/fastquantizeb_neon.asm similarity index 99% rename from vp8/encoder/arm/neon/fastquantizeb_neon.asm rename to vp9/encoder/arm/neon/fastquantizeb_neon.asm index dcf3c5090..259707658 100644 --- a/vp8/encoder/arm/neon/fastquantizeb_neon.asm +++ b/vp9/encoder/arm/neon/fastquantizeb_neon.asm @@ -246,7 +246,7 @@ zero_output ENDP -; default inverse zigzag table is defined in vp8/common/entropy.c +; default inverse zigzag table is defined in vp9/common/entropy.c _inv_zig_zag_ DCD inv_zig_zag diff --git a/vp8/encoder/arm/neon/picklpf_arm.c b/vp9/encoder/arm/neon/picklpf_arm.c similarity index 90% rename from vp8/encoder/arm/neon/picklpf_arm.c rename to vp9/encoder/arm/neon/picklpf_arm.c index 44cb6a674..f16dadc62 100644 --- a/vp8/encoder/arm/neon/picklpf_arm.c +++ b/vp9/encoder/arm/neon/picklpf_arm.c @@ -9,13 +9,13 @@ */ -#include "vp8/common/onyxc_int.h" -#include "vp8/encoder/onyx_int.h" -#include "vp8/encoder/quantize.h" +#include "vp9/common/onyxc_int.h" +#include "vp9/encoder/onyx_int.h" +#include "vp9/encoder/quantize.h" #include "vpx_mem/vpx_mem.h" #include "vpx_scale/yv12extend.h" #include "vpx_scale/vpxscale.h" -#include "vp8/common/alloccommon.h" +#include "vp9/common/alloccommon.h" extern void vp8_memcpy_neon(unsigned char *dst_ptr, unsigned char *src_ptr, int sz); diff --git a/vp8/encoder/arm/neon/sad16_neon.asm b/vp9/encoder/arm/neon/sad16_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/sad16_neon.asm rename to vp9/encoder/arm/neon/sad16_neon.asm diff --git a/vp8/encoder/arm/neon/sad8_neon.asm b/vp9/encoder/arm/neon/sad8_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/sad8_neon.asm rename to vp9/encoder/arm/neon/sad8_neon.asm diff --git a/vp8/encoder/arm/neon/shortfdct_neon.asm b/vp9/encoder/arm/neon/shortfdct_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/shortfdct_neon.asm rename to vp9/encoder/arm/neon/shortfdct_neon.asm diff --git a/vp8/encoder/arm/neon/subtract_neon.asm b/vp9/encoder/arm/neon/subtract_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/subtract_neon.asm rename to vp9/encoder/arm/neon/subtract_neon.asm diff --git a/vp8/encoder/arm/neon/variance_neon.asm b/vp9/encoder/arm/neon/variance_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/variance_neon.asm rename to vp9/encoder/arm/neon/variance_neon.asm diff --git a/vp8/encoder/arm/neon/vp8_memcpy_neon.asm b/vp9/encoder/arm/neon/vp8_memcpy_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/vp8_memcpy_neon.asm rename to vp9/encoder/arm/neon/vp8_memcpy_neon.asm diff --git a/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm b/vp9/encoder/arm/neon/vp8_mse16x16_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/vp8_mse16x16_neon.asm rename to vp9/encoder/arm/neon/vp8_mse16x16_neon.asm diff --git a/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm b/vp9/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm rename to vp9/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm diff --git a/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm b/vp9/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm rename to vp9/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm diff --git a/vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm b/vp9/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm rename to vp9/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.asm diff --git a/vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm b/vp9/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm similarity index 100% rename from vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm rename to vp9/encoder/arm/neon/vp8_subpixelvariance8x8_neon.asm diff --git a/vp8/encoder/arm/quantize_arm.c b/vp9/encoder/arm/quantize_arm.c similarity index 96% rename from vp8/encoder/arm/quantize_arm.c rename to vp9/encoder/arm/quantize_arm.c index b78c2534b..e8aef4f08 100644 --- a/vp8/encoder/arm/quantize_arm.c +++ b/vp9/encoder/arm/quantize_arm.c @@ -12,8 +12,8 @@ #include #include "vpx_mem/vpx_mem.h" -#include "vp8/encoder/quantize.h" -#include "vp8/common/entropy.h" +#include "vp9/encoder/quantize.h" +#include "vp9/common/entropy.h" #if HAVE_ARMV7 diff --git a/vp8/encoder/arm/quantize_arm.h b/vp9/encoder/arm/quantize_arm.h similarity index 100% rename from vp8/encoder/arm/quantize_arm.h rename to vp9/encoder/arm/quantize_arm.h diff --git a/vp8/encoder/arm/variance_arm.c b/vp9/encoder/arm/variance_arm.c similarity index 97% rename from vp8/encoder/arm/variance_arm.c rename to vp9/encoder/arm/variance_arm.c index 097c73e0b..c3da1135d 100644 --- a/vp8/encoder/arm/variance_arm.c +++ b/vp9/encoder/arm/variance_arm.c @@ -9,9 +9,9 @@ */ #include "vpx_config.h" -#include "vp8/encoder/variance.h" -#include "vp8/common/filter.h" -#include "vp8/common/arm/bilinearfilter_arm.h" +#include "vp9/encoder/variance.h" +#include "vp9/common/filter.h" +#include "vp9/common/arm/bilinearfilter_arm.h" #define HALFNDX 8 diff --git a/vp8/encoder/arm/variance_arm.h b/vp9/encoder/arm/variance_arm.h similarity index 100% rename from vp8/encoder/arm/variance_arm.h rename to vp9/encoder/arm/variance_arm.h diff --git a/vp8/encoder/asm_enc_offsets.c b/vp9/encoder/asm_enc_offsets.c similarity index 99% rename from vp8/encoder/asm_enc_offsets.c rename to vp9/encoder/asm_enc_offsets.c index 345240fdc..2be2e4b0b 100644 --- a/vp8/encoder/asm_enc_offsets.c +++ b/vp9/encoder/asm_enc_offsets.c @@ -12,7 +12,7 @@ #include "vpx_ports/asm_offsets.h" #include "vpx_config.h" #include "block.h" -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" #include "onyx_int.h" #include "treewriter.h" #include "tokenize.h" diff --git a/vp8/encoder/bitstream.c b/vp9/encoder/bitstream.c similarity index 99% rename from vp8/encoder/bitstream.c rename to vp9/encoder/bitstream.c index 3bfd5157b..747434414 100644 --- a/vp8/encoder/bitstream.c +++ b/vp9/encoder/bitstream.c @@ -9,29 +9,29 @@ */ -#include "vp8/common/header.h" +#include "vp9/common/header.h" #include "encodemv.h" -#include "vp8/common/entropymode.h" -#include "vp8/common/findnearmv.h" +#include "vp9/common/entropymode.h" +#include "vp9/common/findnearmv.h" #include "mcomp.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/systemdependent.h" #include #include #include -#include "vp8/common/pragmas.h" +#include "vp9/common/pragmas.h" #include "vpx/vpx_encoder.h" #include "vpx_mem/vpx_mem.h" #include "bitstream.h" #include "segmentation.h" -#include "vp8/common/seg_common.h" -#include "vp8/common/pred_common.h" -#include "vp8/common/entropy.h" -#include "vp8/encoder/encodemv.h" -#include "vp8/common/entropymv.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" #if CONFIG_NEWBESTREFMV -#include "vp8/common/mvref_common.h" +#include "vp9/common/mvref_common.h" #endif #if defined(SECTIONBITS_OUTPUT) diff --git a/vp8/encoder/bitstream.h b/vp9/encoder/bitstream.h similarity index 100% rename from vp8/encoder/bitstream.h rename to vp9/encoder/bitstream.h diff --git a/vp8/encoder/block.h b/vp9/encoder/block.h similarity index 97% rename from vp8/encoder/block.h rename to vp9/encoder/block.h index a77017c4f..43c249ca7 100644 --- a/vp8/encoder/block.h +++ b/vp9/encoder/block.h @@ -12,11 +12,11 @@ #ifndef __INC_BLOCK_H #define __INC_BLOCK_H -#include "vp8/common/onyx.h" -#include "vp8/common/entropymv.h" -#include "vp8/common/entropy.h" +#include "vp9/common/onyx.h" +#include "vp9/common/entropymv.h" +#include "vp9/common/entropy.h" #include "vpx_ports/mem.h" -#include "vp8/common/onyxc_int.h" +#include "vp9/common/onyxc_int.h" // motion search site typedef struct { diff --git a/vp8/encoder/boolhuff.c b/vp9/encoder/boolhuff.c similarity index 100% rename from vp8/encoder/boolhuff.c rename to vp9/encoder/boolhuff.c diff --git a/vp8/encoder/boolhuff.h b/vp9/encoder/boolhuff.h similarity index 100% rename from vp8/encoder/boolhuff.h rename to vp9/encoder/boolhuff.h diff --git a/vp8/encoder/dct.c b/vp9/encoder/dct.c similarity index 99% rename from vp8/encoder/dct.c rename to vp9/encoder/dct.c index badb135b3..5e56b4e7f 100644 --- a/vp8/encoder/dct.c +++ b/vp9/encoder/dct.c @@ -12,10 +12,10 @@ #include #include #include "vpx_ports/config.h" -#include "vp8/common/idct.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/idct.h" +#include "vp9/common/systemdependent.h" -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" // TODO: these transforms can be converted into integer forms to reduce // the complexity diff --git a/vp8/encoder/encodeframe.c b/vp9/encoder/encodeframe.c similarity index 99% rename from vp8/encoder/encodeframe.c rename to vp9/encoder/encodeframe.c index 32777876f..a4be21fea 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp9/encoder/encodeframe.c @@ -12,32 +12,32 @@ #include "vpx_ports/config.h" #include "encodemb.h" #include "encodemv.h" -#include "vp8/common/common.h" +#include "vp9/common/common.h" #include "onyx_int.h" -#include "vp8/common/extend.h" -#include "vp8/common/entropymode.h" -#include "vp8/common/quant_common.h" +#include "vp9/common/extend.h" +#include "vp9/common/entropymode.h" +#include "vp9/common/quant_common.h" #include "segmentation.h" -#include "vp8/common/setupintrarecon.h" -#include "vp8/common/reconintra4x4.h" +#include "vp9/common/setupintrarecon.h" +#include "vp9/common/reconintra4x4.h" #include "encodeintra.h" -#include "vp8/common/reconinter.h" -#include "vp8/common/invtrans.h" +#include "vp9/common/reconinter.h" +#include "vp9/common/invtrans.h" #include "rdopt.h" -#include "vp8/common/findnearmv.h" -#include "vp8/common/reconintra.h" -#include "vp8/common/seg_common.h" +#include "vp9/common/findnearmv.h" +#include "vp9/common/reconintra.h" +#include "vp9/common/seg_common.h" #include "vpx_rtcd.h" #include #include #include -#include "vp8/common/subpixel.h" +#include "vp9/common/subpixel.h" #include "vpx_ports/vpx_timer.h" -#include "vp8/common/pred_common.h" +#include "vp9/common/pred_common.h" #define DBG_PRNT_SEGMAP 0 #if CONFIG_NEWBESTREFMV -#include "vp8/common/mvref_common.h" +#include "vp9/common/mvref_common.h" #endif diff --git a/vp8/encoder/encodeintra.c b/vp9/encoder/encodeintra.c similarity index 98% rename from vp8/encoder/encodeintra.c rename to vp9/encoder/encodeintra.c index e89e96c44..32aa5bde4 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp9/encoder/encodeintra.c @@ -10,12 +10,12 @@ #include "vpx_ports/config.h" #include "vpx_rtcd.h" -#include "vp8/common/idct.h" +#include "vp9/common/idct.h" #include "quantize.h" -#include "vp8/common/reconintra.h" -#include "vp8/common/reconintra4x4.h" +#include "vp9/common/reconintra.h" +#include "vp9/common/reconintra4x4.h" #include "encodemb.h" -#include "vp8/common/invtrans.h" +#include "vp9/common/invtrans.h" #include "encodeintra.h" #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp8/encoder/encodeintra.h b/vp9/encoder/encodeintra.h similarity index 100% rename from vp8/encoder/encodeintra.h rename to vp9/encoder/encodeintra.h diff --git a/vp8/encoder/encodemb.c b/vp9/encoder/encodemb.c similarity index 99% rename from vp8/encoder/encodemb.c rename to vp9/encoder/encodemb.c index d6221daed..d828c51c6 100644 --- a/vp8/encoder/encodemb.c +++ b/vp9/encoder/encodemb.c @@ -10,14 +10,14 @@ #include "vpx_ports/config.h" #include "encodemb.h" -#include "vp8/common/reconinter.h" +#include "vp9/common/reconinter.h" #include "quantize.h" #include "tokenize.h" -#include "vp8/common/invtrans.h" -#include "vp8/common/reconintra.h" +#include "vp9/common/invtrans.h" +#include "vp9/common/reconintra.h" #include "vpx_mem/vpx_mem.h" #include "rdopt.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/systemdependent.h" #include "vpx_rtcd.h" #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp8/encoder/encodemb.h b/vp9/encoder/encodemb.h similarity index 100% rename from vp8/encoder/encodemb.h rename to vp9/encoder/encodemb.h diff --git a/vp8/encoder/encodemv.c b/vp9/encoder/encodemv.c similarity index 99% rename from vp8/encoder/encodemv.c rename to vp9/encoder/encodemv.c index 675fb0b59..0483d81c7 100644 --- a/vp8/encoder/encodemv.c +++ b/vp9/encoder/encodemv.c @@ -9,10 +9,10 @@ */ -#include "vp8/common/common.h" +#include "vp9/common/common.h" #include "encodemv.h" -#include "vp8/common/entropymode.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/entropymode.h" +#include "vp9/common/systemdependent.h" #include diff --git a/vp8/encoder/encodemv.h b/vp9/encoder/encodemv.h similarity index 100% rename from vp8/encoder/encodemv.h rename to vp9/encoder/encodemv.h diff --git a/vp8/encoder/firstpass.c b/vp9/encoder/firstpass.c similarity index 99% rename from vp8/encoder/firstpass.c rename to vp9/encoder/firstpass.c index a7ae9189a..4ca190334 100644 --- a/vp8/encoder/firstpass.c +++ b/vp9/encoder/firstpass.c @@ -14,21 +14,21 @@ #include "onyx_int.h" #include "variance.h" #include "encodeintra.h" -#include "vp8/common/setupintrarecon.h" +#include "vp9/common/setupintrarecon.h" #include "mcomp.h" #include "firstpass.h" #include "vpx_scale/vpxscale.h" #include "encodemb.h" -#include "vp8/common/extend.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/extend.h" +#include "vp9/common/systemdependent.h" #include "vpx_scale/yv12extend.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/swapyv12buffer.h" +#include "vp9/common/swapyv12buffer.h" #include #include "rdopt.h" #include "ratectrl.h" -#include "vp8/common/quant_common.h" -#include "vp8/common/entropymv.h" +#include "vp9/common/quant_common.h" +#include "vp9/common/entropymv.h" #include "encodemv.h" #define OUTPUT_FPF 0 diff --git a/vp8/encoder/firstpass.h b/vp9/encoder/firstpass.h similarity index 100% rename from vp8/encoder/firstpass.h rename to vp9/encoder/firstpass.h diff --git a/vp8/encoder/generic/csystemdependent.c b/vp9/encoder/generic/csystemdependent.c similarity index 95% rename from vp8/encoder/generic/csystemdependent.c rename to vp9/encoder/generic/csystemdependent.c index 03f1add3b..589d0a50b 100644 --- a/vp8/encoder/generic/csystemdependent.c +++ b/vp9/encoder/generic/csystemdependent.c @@ -10,8 +10,8 @@ #include "vpx_ports/config.h" -#include "vp8/encoder/variance.h" -#include "vp8/encoder/onyx_int.h" +#include "vp9/encoder/variance.h" +#include "vp9/encoder/onyx_int.h" void vp9_arch_x86_encoder_init(VP9_COMP *cpi); diff --git a/vp8/encoder/lookahead.c b/vp9/encoder/lookahead.c similarity index 99% rename from vp8/encoder/lookahead.c rename to vp9/encoder/lookahead.c index ec21a8480..25fa06921 100644 --- a/vp8/encoder/lookahead.c +++ b/vp9/encoder/lookahead.c @@ -11,7 +11,7 @@ #include #include "vpx_config.h" #include "lookahead.h" -#include "vp8/common/extend.h" +#include "vp9/common/extend.h" #define MAX_LAG_BUFFERS 25 diff --git a/vp8/encoder/lookahead.h b/vp9/encoder/lookahead.h similarity index 100% rename from vp8/encoder/lookahead.h rename to vp9/encoder/lookahead.h diff --git a/vp8/encoder/mbgraph.c b/vp9/encoder/mbgraph.c similarity index 98% rename from vp8/encoder/mbgraph.c rename to vp9/encoder/mbgraph.c index d2e609876..975cfe5dd 100644 --- a/vp8/encoder/mbgraph.c +++ b/vp9/encoder/mbgraph.c @@ -9,14 +9,14 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi, int_mv *ref_mv, diff --git a/vp8/encoder/mbgraph.h b/vp9/encoder/mbgraph.h similarity index 100% rename from vp8/encoder/mbgraph.h rename to vp9/encoder/mbgraph.h diff --git a/vp8/encoder/mcomp.c b/vp9/encoder/mcomp.c similarity index 99% rename from vp8/encoder/mcomp.c rename to vp9/encoder/mcomp.c index 110dbcb9d..29d0a1e05 100644 --- a/vp8/encoder/mcomp.c +++ b/vp9/encoder/mcomp.c @@ -9,14 +9,14 @@ */ -#include "vp8/encoder/onyx_int.h" +#include "vp9/encoder/onyx_int.h" #include "mcomp.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/config.h" #include #include #include -#include "vp8/common/findnearmv.h" +#include "vp9/common/findnearmv.h" #ifdef ENTROPY_STATS static int mv_ref_ct [31] [4] [2]; diff --git a/vp8/encoder/mcomp.h b/vp9/encoder/mcomp.h similarity index 100% rename from vp8/encoder/mcomp.h rename to vp9/encoder/mcomp.h diff --git a/vp8/encoder/modecosts.c b/vp9/encoder/modecosts.c similarity index 96% rename from vp8/encoder/modecosts.c rename to vp9/encoder/modecosts.c index 57d1ae671..2224f5430 100644 --- a/vp8/encoder/modecosts.c +++ b/vp9/encoder/modecosts.c @@ -9,10 +9,10 @@ */ -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" #include "onyx_int.h" #include "treewriter.h" -#include "vp8/common/entropymode.h" +#include "vp9/common/entropymode.h" void vp9_init_mode_costs(VP9_COMP *c) { diff --git a/vp8/encoder/modecosts.h b/vp9/encoder/modecosts.h similarity index 100% rename from vp8/encoder/modecosts.h rename to vp9/encoder/modecosts.h diff --git a/vp8/encoder/onyx_if.c b/vp9/encoder/onyx_if.c similarity index 99% rename from vp8/encoder/onyx_if.c rename to vp9/encoder/onyx_if.c index 4fd6f84d4..d89e055dc 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp9/encoder/onyx_if.c @@ -10,37 +10,37 @@ #include "vpx_config.h" -#include "vp8/common/onyxc_int.h" +#include "vp9/common/onyxc_int.h" #include "onyx_int.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/systemdependent.h" #include "quantize.h" -#include "vp8/common/alloccommon.h" +#include "vp9/common/alloccommon.h" #include "mcomp.h" #include "firstpass.h" #include "psnr.h" #include "vpx_scale/vpxscale.h" -#include "vp8/common/extend.h" +#include "vp9/common/extend.h" #include "ratectrl.h" -#include "vp8/common/quant_common.h" +#include "vp9/common/quant_common.h" #include "segmentation.h" #include "vpx_scale/yv12extend.h" #if CONFIG_POSTPROC -#include "vp8/common/postproc.h" +#include "vp9/common/postproc.h" #endif #include "vpx_mem/vpx_mem.h" -#include "vp8/common/swapyv12buffer.h" +#include "vp9/common/swapyv12buffer.h" #include "vpx_ports/vpx_timer.h" #include "temporal_filter.h" -#include "vp8/common/seg_common.h" +#include "vp9/common/seg_common.h" #include "mbgraph.h" -#include "vp8/common/pred_common.h" -#include "vp8/encoder/rdopt.h" +#include "vp9/common/pred_common.h" +#include "vp9/encoder/rdopt.h" #include "bitstream.h" #include "ratectrl.h" #if CONFIG_NEWBESTREFMV -#include "vp8/common/mvref_common.h" +#include "vp9/common/mvref_common.h" #endif #if ARCH_ARM diff --git a/vp8/encoder/onyx_int.h b/vp9/encoder/onyx_int.h similarity index 99% rename from vp8/encoder/onyx_int.h rename to vp9/encoder/onyx_int.h index 42cb97232..b1bd79325 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp9/encoder/onyx_int.h @@ -14,20 +14,20 @@ #include #include "vpx_ports/config.h" -#include "vp8/common/onyx.h" +#include "vp9/common/onyx.h" #include "treewriter.h" #include "tokenize.h" -#include "vp8/common/onyxc_int.h" +#include "vp9/common/onyxc_int.h" #include "variance.h" #include "encodemb.h" #include "quantize.h" -#include "vp8/common/entropy.h" -#include "vp8/common/entropymode.h" +#include "vp9/common/entropy.h" +#include "vp9/common/entropymode.h" #include "vpx_ports/mem.h" #include "vpx/internal/vpx_codec_internal.h" #include "mcomp.h" #include "temporal_filter.h" -#include "vp8/common/findnearmv.h" +#include "vp9/common/findnearmv.h" #include "lookahead.h" // #define SPEEDSTATS 1 diff --git a/vp8/encoder/picklpf.c b/vp9/encoder/picklpf.c similarity index 99% rename from vp8/encoder/picklpf.c rename to vp9/encoder/picklpf.c index 147a20543..9363bccca 100644 --- a/vp8/encoder/picklpf.c +++ b/vp9/encoder/picklpf.c @@ -9,14 +9,14 @@ */ -#include "vp8/common/onyxc_int.h" +#include "vp9/common/onyxc_int.h" #include "onyx_int.h" #include "quantize.h" #include "vpx_mem/vpx_mem.h" #include "vpx_scale/yv12extend.h" #include "vpx_scale/vpxscale.h" -#include "vp8/common/alloccommon.h" -#include "vp8/common/loopfilter.h" +#include "vp9/common/alloccommon.h" +#include "vp9/common/loopfilter.h" #if ARCH_ARM #include "vpx_ports/arm.h" #endif diff --git a/vp8/encoder/ppc/csystemdependent.c b/vp9/encoder/ppc/csystemdependent.c similarity index 98% rename from vp8/encoder/ppc/csystemdependent.c rename to vp9/encoder/ppc/csystemdependent.c index edecb2033..f06f43b8d 100644 --- a/vp8/encoder/ppc/csystemdependent.c +++ b/vp9/encoder/ppc/csystemdependent.c @@ -9,8 +9,8 @@ */ -#include "vp8/encoder/variance.h" -#include "vp8/encoder/onyx_int.h" +#include "vp9/encoder/variance.h" +#include "vp9/encoder/onyx_int.h" SADFunction *vp9_sad16x16; SADFunction *vp9_sad16x8; diff --git a/vp8/encoder/ppc/encodemb_altivec.asm b/vp9/encoder/ppc/encodemb_altivec.asm similarity index 100% rename from vp8/encoder/ppc/encodemb_altivec.asm rename to vp9/encoder/ppc/encodemb_altivec.asm diff --git a/vp8/encoder/ppc/fdct_altivec.asm b/vp9/encoder/ppc/fdct_altivec.asm similarity index 100% rename from vp8/encoder/ppc/fdct_altivec.asm rename to vp9/encoder/ppc/fdct_altivec.asm diff --git a/vp8/encoder/ppc/rdopt_altivec.asm b/vp9/encoder/ppc/rdopt_altivec.asm similarity index 100% rename from vp8/encoder/ppc/rdopt_altivec.asm rename to vp9/encoder/ppc/rdopt_altivec.asm diff --git a/vp8/encoder/ppc/sad_altivec.asm b/vp9/encoder/ppc/sad_altivec.asm similarity index 100% rename from vp8/encoder/ppc/sad_altivec.asm rename to vp9/encoder/ppc/sad_altivec.asm diff --git a/vp8/encoder/ppc/variance_altivec.asm b/vp9/encoder/ppc/variance_altivec.asm similarity index 100% rename from vp8/encoder/ppc/variance_altivec.asm rename to vp9/encoder/ppc/variance_altivec.asm diff --git a/vp8/encoder/ppc/variance_subpixel_altivec.asm b/vp9/encoder/ppc/variance_subpixel_altivec.asm similarity index 100% rename from vp8/encoder/ppc/variance_subpixel_altivec.asm rename to vp9/encoder/ppc/variance_subpixel_altivec.asm diff --git a/vp8/encoder/psnr.c b/vp9/encoder/psnr.c similarity index 92% rename from vp8/encoder/psnr.c rename to vp9/encoder/psnr.c index 04850518f..6b67bd3b9 100644 --- a/vp8/encoder/psnr.c +++ b/vp9/encoder/psnr.c @@ -11,7 +11,7 @@ #include "vpx_scale/yv12config.h" #include "math.h" -#include "vp8/common/systemdependent.h" /* for vp9_clear_system_state() */ +#include "vp9/common/systemdependent.h" /* for vp9_clear_system_state() */ #define MAX_PSNR 100 diff --git a/vp8/encoder/psnr.h b/vp9/encoder/psnr.h similarity index 100% rename from vp8/encoder/psnr.h rename to vp9/encoder/psnr.h diff --git a/vp8/encoder/quantize.c b/vp9/encoder/quantize.c similarity index 99% rename from vp8/encoder/quantize.c rename to vp9/encoder/quantize.c index 65b533d2c..807a55c18 100644 --- a/vp8/encoder/quantize.c +++ b/vp9/encoder/quantize.c @@ -13,9 +13,9 @@ #include "onyx_int.h" #include "quantize.h" -#include "vp8/common/quant_common.h" +#include "vp9/common/quant_common.h" -#include "vp8/common/seg_common.h" +#include "vp9/common/seg_common.h" #ifdef ENC_DEBUG extern int enc_debug; diff --git a/vp8/encoder/quantize.h b/vp9/encoder/quantize.h similarity index 100% rename from vp8/encoder/quantize.h rename to vp9/encoder/quantize.h diff --git a/vp8/encoder/ratectrl.c b/vp9/encoder/ratectrl.c similarity index 99% rename from vp8/encoder/ratectrl.c rename to vp9/encoder/ratectrl.c index 1ce5e0eb8..62a940d2a 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp9/encoder/ratectrl.c @@ -16,14 +16,14 @@ #include #include "math.h" -#include "vp8/common/alloccommon.h" -#include "vp8/common/common.h" +#include "vp9/common/alloccommon.h" +#include "vp9/common/common.h" #include "ratectrl.h" -#include "vp8/common/entropymode.h" +#include "vp9/common/entropymode.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/systemdependent.h" #include "encodemv.h" -#include "vp8/common/quant_common.h" +#include "vp9/common/quant_common.h" #define MIN_BPB_FACTOR 0.005 #define MAX_BPB_FACTOR 50 diff --git a/vp8/encoder/ratectrl.h b/vp9/encoder/ratectrl.h similarity index 100% rename from vp8/encoder/ratectrl.h rename to vp9/encoder/ratectrl.h diff --git a/vp8/encoder/rdopt.c b/vp9/encoder/rdopt.c similarity index 99% rename from vp8/encoder/rdopt.c rename to vp9/encoder/rdopt.c index a30f9ce2a..1db912787 100644 --- a/vp8/encoder/rdopt.c +++ b/vp9/encoder/rdopt.c @@ -13,36 +13,36 @@ #include #include #include -#include "vp8/common/pragmas.h" +#include "vp9/common/pragmas.h" #include "tokenize.h" #include "treewriter.h" #include "onyx_int.h" #include "modecosts.h" #include "encodeintra.h" -#include "vp8/common/entropymode.h" -#include "vp8/common/reconinter.h" -#include "vp8/common/reconintra.h" -#include "vp8/common/reconintra4x4.h" -#include "vp8/common/findnearmv.h" -#include "vp8/common/quant_common.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 "vp8/common/idct.h" +#include "vp9/common/idct.h" #include "variance.h" #include "mcomp.h" #include "rdopt.h" #include "ratectrl.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/systemdependent.h" -#include "vp8/encoder/encodemv.h" +#include "vp9/common/systemdependent.h" +#include "vp9/encoder/encodemv.h" -#include "vp8/common/seg_common.h" -#include "vp8/common/pred_common.h" -#include "vp8/common/entropy.h" +#include "vp9/common/seg_common.h" +#include "vp9/common/pred_common.h" +#include "vp9/common/entropy.h" #include "vpx_rtcd.h" #if CONFIG_NEWBESTREFMV -#include "vp8/common/mvref_common.h" +#include "vp9/common/mvref_common.h" #endif #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp8/encoder/rdopt.h b/vp9/encoder/rdopt.h similarity index 100% rename from vp8/encoder/rdopt.h rename to vp9/encoder/rdopt.h diff --git a/vp8/encoder/sad_c.c b/vp9/encoder/sad_c.c similarity index 99% rename from vp8/encoder/sad_c.c rename to vp9/encoder/sad_c.c index 332514141..0e02fabdf 100644 --- a/vp8/encoder/sad_c.c +++ b/vp9/encoder/sad_c.c @@ -10,7 +10,7 @@ #include -#include "vp8/common/sadmxn.h" +#include "vp9/common/sadmxn.h" #include "vpx_ports/config.h" #include "vpx/vpx_integer.h" diff --git a/vp8/encoder/satd_c.c b/vp9/encoder/satd_c.c similarity index 100% rename from vp8/encoder/satd_c.c rename to vp9/encoder/satd_c.c diff --git a/vp8/encoder/segmentation.c b/vp9/encoder/segmentation.c similarity index 99% rename from vp8/encoder/segmentation.c rename to vp9/encoder/segmentation.c index c68925ee6..463cd4a0a 100644 --- a/vp8/encoder/segmentation.c +++ b/vp9/encoder/segmentation.c @@ -12,7 +12,7 @@ #include "limits.h" #include "vpx_mem/vpx_mem.h" #include "segmentation.h" -#include "vp8/common/pred_common.h" +#include "vp9/common/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/vp8/encoder/segmentation.h b/vp9/encoder/segmentation.h similarity index 98% rename from vp8/encoder/segmentation.h rename to vp9/encoder/segmentation.h index 7719da38a..8caea4878 100644 --- a/vp8/encoder/segmentation.h +++ b/vp9/encoder/segmentation.h @@ -10,7 +10,7 @@ #include "string.h" -#include "vp8/common/blockd.h" +#include "vp9/common/blockd.h" #include "onyx_int.h" #ifndef __INC_SEGMENTATION_H__ diff --git a/vp8/encoder/ssim.c b/vp9/encoder/ssim.c similarity index 100% rename from vp8/encoder/ssim.c rename to vp9/encoder/ssim.c diff --git a/vp8/encoder/temporal_filter.c b/vp9/encoder/temporal_filter.c similarity index 98% rename from vp8/encoder/temporal_filter.c rename to vp9/encoder/temporal_filter.c index 7e532ea6c..db8b36138 100644 --- a/vp8/encoder/temporal_filter.c +++ b/vp9/encoder/temporal_filter.c @@ -9,22 +9,22 @@ */ -#include "vp8/common/onyxc_int.h" +#include "vp9/common/onyxc_int.h" #include "onyx_int.h" -#include "vp8/common/systemdependent.h" +#include "vp9/common/systemdependent.h" #include "quantize.h" -#include "vp8/common/alloccommon.h" +#include "vp9/common/alloccommon.h" #include "mcomp.h" #include "firstpass.h" #include "psnr.h" #include "vpx_scale/vpxscale.h" -#include "vp8/common/extend.h" +#include "vp9/common/extend.h" #include "ratectrl.h" -#include "vp8/common/quant_common.h" +#include "vp9/common/quant_common.h" #include "segmentation.h" #include "vpx_scale/yv12extend.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/swapyv12buffer.h" +#include "vp9/common/swapyv12buffer.h" #include "vpx_ports/vpx_timer.h" #include diff --git a/vp8/encoder/temporal_filter.h b/vp9/encoder/temporal_filter.h similarity index 100% rename from vp8/encoder/temporal_filter.h rename to vp9/encoder/temporal_filter.h diff --git a/vp8/encoder/tokenize.c b/vp9/encoder/tokenize.c similarity index 99% rename from vp8/encoder/tokenize.c rename to vp9/encoder/tokenize.c index 5c5b6730a..3c5c1c7a2 100644 --- a/vp8/encoder/tokenize.c +++ b/vp9/encoder/tokenize.c @@ -17,9 +17,9 @@ #include "tokenize.h" #include "vpx_mem/vpx_mem.h" -#include "vp8/common/pred_common.h" -#include "vp8/common/seg_common.h" -#include "vp8/common/entropy.h" +#include "vp9/common/pred_common.h" +#include "vp9/common/seg_common.h" +#include "vp9/common/entropy.h" /* Global event counters used for accumulating statistics across several compressions, then generating context.c = initial stats. */ diff --git a/vp8/encoder/tokenize.h b/vp9/encoder/tokenize.h similarity index 98% rename from vp8/encoder/tokenize.h rename to vp9/encoder/tokenize.h index 4cca36e40..bef52c505 100644 --- a/vp8/encoder/tokenize.h +++ b/vp9/encoder/tokenize.h @@ -12,7 +12,7 @@ #ifndef tokenize_h #define tokenize_h -#include "vp8/common/entropy.h" +#include "vp9/common/entropy.h" #include "block.h" void vp9_tokenize_initialize(); diff --git a/vp8/encoder/treewriter.c b/vp9/encoder/treewriter.c similarity index 100% rename from vp8/encoder/treewriter.c rename to vp9/encoder/treewriter.c diff --git a/vp8/encoder/treewriter.h b/vp9/encoder/treewriter.h similarity index 98% rename from vp8/encoder/treewriter.h rename to vp9/encoder/treewriter.h index e2a0ee2d7..1e1bf3d6b 100644 --- a/vp8/encoder/treewriter.h +++ b/vp9/encoder/treewriter.h @@ -15,7 +15,7 @@ /* Trees map alphabets into huffman-like codes suitable for an arithmetic bit coder. Timothy S Murphy 11 October 2004 */ -#include "vp8/common/treecoder.h" +#include "vp9/common/treecoder.h" #include "boolhuff.h" /* for now */ diff --git a/vp8/encoder/variance.h b/vp9/encoder/variance.h similarity index 100% rename from vp8/encoder/variance.h rename to vp9/encoder/variance.h diff --git a/vp8/encoder/variance_c.c b/vp9/encoder/variance_c.c similarity index 99% rename from vp8/encoder/variance_c.c rename to vp9/encoder/variance_c.c index 4dc554dbf..1577cac8c 100644 --- a/vp8/encoder/variance_c.c +++ b/vp9/encoder/variance_c.c @@ -10,7 +10,7 @@ #include "variance.h" -#include "vp8/common/filter.h" +#include "vp9/common/filter.h" unsigned int vp9_get_mb_ss_c(const short *src_ptr) { diff --git a/vp8/encoder/x86/dct_mmx.asm b/vp9/encoder/x86/dct_mmx.asm similarity index 100% rename from vp8/encoder/x86/dct_mmx.asm rename to vp9/encoder/x86/dct_mmx.asm diff --git a/vp8/encoder/x86/dct_sse2.asm b/vp9/encoder/x86/dct_sse2.asm similarity index 100% rename from vp8/encoder/x86/dct_sse2.asm rename to vp9/encoder/x86/dct_sse2.asm diff --git a/vp8/encoder/x86/encodeopt.asm b/vp9/encoder/x86/encodeopt.asm similarity index 100% rename from vp8/encoder/x86/encodeopt.asm rename to vp9/encoder/x86/encodeopt.asm diff --git a/vp8/encoder/x86/fwalsh_sse2.asm b/vp9/encoder/x86/fwalsh_sse2.asm similarity index 100% rename from vp8/encoder/x86/fwalsh_sse2.asm rename to vp9/encoder/x86/fwalsh_sse2.asm diff --git a/vp8/encoder/x86/mcomp_x86.h b/vp9/encoder/x86/mcomp_x86.h similarity index 100% rename from vp8/encoder/x86/mcomp_x86.h rename to vp9/encoder/x86/mcomp_x86.h diff --git a/vp8/encoder/x86/quantize_mmx.asm b/vp9/encoder/x86/quantize_mmx.asm similarity index 100% rename from vp8/encoder/x86/quantize_mmx.asm rename to vp9/encoder/x86/quantize_mmx.asm diff --git a/vp8/encoder/x86/quantize_sse2.asm b/vp9/encoder/x86/quantize_sse2.asm similarity index 99% rename from vp8/encoder/x86/quantize_sse2.asm rename to vp9/encoder/x86/quantize_sse2.asm index 153060e74..9b563c514 100644 --- a/vp8/encoder/x86/quantize_sse2.asm +++ b/vp9/encoder/x86/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 vp8/common/entropy.c +; in vp9_default_zig_zag1d order: see vp9/common/entropy.c ZIGZAG_LOOP 0 ZIGZAG_LOOP 1 ZIGZAG_LOOP 4 diff --git a/vp8/encoder/x86/quantize_sse4.asm b/vp9/encoder/x86/quantize_sse4.asm similarity index 98% rename from vp8/encoder/x86/quantize_sse4.asm rename to vp9/encoder/x86/quantize_sse4.asm index 8ce1b7cff..c7429ecd3 100644 --- a/vp8/encoder/x86/quantize_sse4.asm +++ b/vp9/encoder/x86/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 vp8/common/entropy.c +; in vp9_default_zig_zag1d order: see vp9/common/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 -; vp8/common/entropy.c: vp9_default_zig_zag1d +; vp9/common/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/vp8/encoder/x86/quantize_ssse3.asm b/vp9/encoder/x86/quantize_ssse3.asm similarity index 100% rename from vp8/encoder/x86/quantize_ssse3.asm rename to vp9/encoder/x86/quantize_ssse3.asm diff --git a/vp8/encoder/x86/quantize_x86.h b/vp9/encoder/x86/quantize_x86.h similarity index 100% rename from vp8/encoder/x86/quantize_x86.h rename to vp9/encoder/x86/quantize_x86.h diff --git a/vp8/encoder/x86/sad_mmx.asm b/vp9/encoder/x86/sad_mmx.asm similarity index 100% rename from vp8/encoder/x86/sad_mmx.asm rename to vp9/encoder/x86/sad_mmx.asm diff --git a/vp8/encoder/x86/sad_sse2.asm b/vp9/encoder/x86/sad_sse2.asm similarity index 100% rename from vp8/encoder/x86/sad_sse2.asm rename to vp9/encoder/x86/sad_sse2.asm diff --git a/vp8/encoder/x86/sad_sse3.asm b/vp9/encoder/x86/sad_sse3.asm similarity index 100% rename from vp8/encoder/x86/sad_sse3.asm rename to vp9/encoder/x86/sad_sse3.asm diff --git a/vp8/encoder/x86/sad_sse4.asm b/vp9/encoder/x86/sad_sse4.asm similarity index 100% rename from vp8/encoder/x86/sad_sse4.asm rename to vp9/encoder/x86/sad_sse4.asm diff --git a/vp8/encoder/x86/sad_ssse3.asm b/vp9/encoder/x86/sad_ssse3.asm similarity index 100% rename from vp8/encoder/x86/sad_ssse3.asm rename to vp9/encoder/x86/sad_ssse3.asm diff --git a/vp8/encoder/x86/ssim_opt.asm b/vp9/encoder/x86/ssim_opt.asm similarity index 100% rename from vp8/encoder/x86/ssim_opt.asm rename to vp9/encoder/x86/ssim_opt.asm diff --git a/vp8/encoder/x86/subtract_mmx.asm b/vp9/encoder/x86/subtract_mmx.asm similarity index 100% rename from vp8/encoder/x86/subtract_mmx.asm rename to vp9/encoder/x86/subtract_mmx.asm diff --git a/vp8/encoder/x86/subtract_sse2.asm b/vp9/encoder/x86/subtract_sse2.asm similarity index 100% rename from vp8/encoder/x86/subtract_sse2.asm rename to vp9/encoder/x86/subtract_sse2.asm diff --git a/vp8/encoder/x86/temporal_filter_apply_sse2.asm b/vp9/encoder/x86/temporal_filter_apply_sse2.asm similarity index 100% rename from vp8/encoder/x86/temporal_filter_apply_sse2.asm rename to vp9/encoder/x86/temporal_filter_apply_sse2.asm diff --git a/vp8/encoder/x86/temporal_filter_x86.h b/vp9/encoder/x86/temporal_filter_x86.h similarity index 100% rename from vp8/encoder/x86/temporal_filter_x86.h rename to vp9/encoder/x86/temporal_filter_x86.h diff --git a/vp8/encoder/x86/variance_impl_mmx.asm b/vp9/encoder/x86/variance_impl_mmx.asm similarity index 100% rename from vp8/encoder/x86/variance_impl_mmx.asm rename to vp9/encoder/x86/variance_impl_mmx.asm diff --git a/vp8/encoder/x86/variance_impl_sse2.asm b/vp9/encoder/x86/variance_impl_sse2.asm similarity index 100% rename from vp8/encoder/x86/variance_impl_sse2.asm rename to vp9/encoder/x86/variance_impl_sse2.asm diff --git a/vp8/encoder/x86/variance_impl_ssse3.asm b/vp9/encoder/x86/variance_impl_ssse3.asm similarity index 100% rename from vp8/encoder/x86/variance_impl_ssse3.asm rename to vp9/encoder/x86/variance_impl_ssse3.asm diff --git a/vp8/encoder/x86/variance_mmx.c b/vp9/encoder/x86/variance_mmx.c similarity index 99% rename from vp8/encoder/x86/variance_mmx.c rename to vp9/encoder/x86/variance_mmx.c index 2d72d50a8..3fedc6b5c 100644 --- a/vp8/encoder/x86/variance_mmx.c +++ b/vp9/encoder/x86/variance_mmx.c @@ -9,8 +9,8 @@ */ #include "vpx_config.h" -#include "vp8/encoder/variance.h" -#include "vp8/common/pragmas.h" +#include "vp9/encoder/variance.h" +#include "vp9/common/pragmas.h" #include "vpx_ports/mem.h" extern void filter_block1d_h6_mmx diff --git a/vp8/encoder/x86/variance_sse2.c b/vp9/encoder/x86/variance_sse2.c similarity index 99% rename from vp8/encoder/x86/variance_sse2.c rename to vp9/encoder/x86/variance_sse2.c index f3b0b600a..e63c53a53 100644 --- a/vp8/encoder/x86/variance_sse2.c +++ b/vp9/encoder/x86/variance_sse2.c @@ -9,8 +9,8 @@ */ #include "vpx_config.h" -#include "vp8/encoder/variance.h" -#include "vp8/common/pragmas.h" +#include "vp9/encoder/variance.h" +#include "vp9/common/pragmas.h" #include "vpx_ports/mem.h" #define HALFNDX 8 diff --git a/vp8/encoder/x86/variance_ssse3.c b/vp9/encoder/x86/variance_ssse3.c similarity index 98% rename from vp8/encoder/x86/variance_ssse3.c rename to vp9/encoder/x86/variance_ssse3.c index f33c662e1..f37abb881 100644 --- a/vp8/encoder/x86/variance_ssse3.c +++ b/vp9/encoder/x86/variance_ssse3.c @@ -9,8 +9,8 @@ */ #include "vpx_config.h" -#include "vp8/encoder/variance.h" -#include "vp8/common/pragmas.h" +#include "vp9/encoder/variance.h" +#include "vp9/common/pragmas.h" #include "vpx_ports/mem.h" #define HALFNDX 8 diff --git a/vp8/encoder/x86/x86_csystemdependent.c b/vp9/encoder/x86/x86_csystemdependent.c similarity index 98% rename from vp8/encoder/x86/x86_csystemdependent.c rename to vp9/encoder/x86/x86_csystemdependent.c index 4af69c719..4cff713db 100644 --- a/vp8/encoder/x86/x86_csystemdependent.c +++ b/vp9/encoder/x86/x86_csystemdependent.c @@ -11,8 +11,8 @@ #include "vpx_ports/config.h" #include "vpx_ports/x86.h" -#include "vp8/encoder/variance.h" -#include "vp8/encoder/onyx_int.h" +#include "vp9/encoder/variance.h" +#include "vp9/encoder/onyx_int.h" #if HAVE_MMX diff --git a/vp8/exports_dec b/vp9/exports_dec similarity index 100% rename from vp8/exports_dec rename to vp9/exports_dec diff --git a/vp8/exports_enc b/vp9/exports_enc similarity index 100% rename from vp8/exports_enc rename to vp9/exports_enc diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk new file mode 100644 index 000000000..c5237d846 --- /dev/null +++ b/vp9/vp9_common.mk @@ -0,0 +1,179 @@ +## +## Copyright (c) 2010 The WebM project authors. All Rights Reserved. +## +## Use of this source code is governed by a BSD-style license +## that can be found in the LICENSE file in the root of the source +## tree. An additional intellectual property rights grant can be found +## in the file PATENTS. All contributing project authors may +## be found in the AUTHORS file in the root of the source tree. +## + +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/idct.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/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-$(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 +ifeq ($(CONFIG_POSTPROC),yes) +VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/postproc_mmx.asm +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/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 +endif + +VP9_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/filter_sse4.c +ifeq ($(HAVE_SSE4_1),yes) +vp9/common/x86/filter_sse4.c.o: CFLAGS += -msse4 +endif + +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/filter_sse2.c +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/sadmxn_x86.c +ifeq ($(HAVE_SSE2),yes) +vp9/common/x86/filter_sse2.c.o: CFLAGS += -msse2 +vp9/common/x86/loopfilter_x86.c.o: CFLAGS += -msse2 +vp9/common/x86/sadmxn_x86.c.o: 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 + +# common (armv6) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/bilinearfilter_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x4_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem8x8_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/copymem16x16_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/dc_only_idct_add_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/iwalsh_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/filter_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/idct_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/loopfilter_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/recon_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/simpleloopfilter_v6$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/sixtappredict8x4_v6$(ASM) + +# common (neon) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict4x4_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict8x4_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict8x8_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/bilinearpredict16x16_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem8x4_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem8x8_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/copymem16x16_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/dc_only_idct_add_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/iwalsh_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfilter_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfiltersimplehorizontaledge_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/loopfiltersimpleverticaledge_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/mbloopfilter_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon2b_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon4b_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/reconb_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/shortidct4x4llm_1_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/shortidct4x4llm_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict4x4_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict8x4_neon$(ASM) +VP9_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/sixtappredict8x8_neon$(ASM) +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 diff --git a/vp8/vp8_cx_iface.c b/vp9/vp9_cx_iface.c similarity index 99% rename from vp8/vp8_cx_iface.c rename to vp9/vp9_cx_iface.c index 3d42ef37a..1d8d950e0 100644 --- a/vp8/vp8_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 "vp8/encoder/onyx_int.h" +#include "vp9/encoder/onyx_int.h" #include "vpx/vp8e.h" -#include "vp8/encoder/firstpass.h" -#include "vp8/common/onyx.h" +#include "vp9/encoder/firstpass.h" +#include "vp9/common/onyx.h" #include #include diff --git a/vp8/vp8_dx_iface.c b/vp9/vp9_dx_iface.c similarity index 100% rename from vp8/vp8_dx_iface.c rename to vp9/vp9_dx_iface.c diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk new file mode 100644 index 000000000..ebb7a575d --- /dev/null +++ b/vp9/vp9cx.mk @@ -0,0 +1,120 @@ +## +## Copyright (c) 2010 The WebM project authors. All Rights Reserved. +## +## Use of this source code is governed by a BSD-style license +## that can be found in the LICENSE file in the root of the source +## tree. An additional intellectual property rights grant can be found +## in the file PATENTS. All contributing project authors may +## be found in the AUTHORS file in the root of the source tree. +## + + +include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk + +VP9_CX_EXPORTS += exports_enc + +VP9_CX_SRCS-yes += $(VP9_COMMON_SRCS-yes) +VP9_CX_SRCS-no += $(VP9_COMMON_SRCS-no) +VP9_CX_SRCS_REMOVE-yes += $(VP9_COMMON_SRCS_REMOVE-yes) +VP9_CX_SRCS_REMOVE-no += $(VP9_COMMON_SRCS_REMOVE-no) + +ifeq ($(ARCH_ARM),yes) + include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx_arm.mk +endif + +VP9_CX_SRCS-yes += vp9_cx_iface.c + +# encoder +#INCLUDES += algo/vpx_common/vpx_mem/include +#INCLUDES += common +#INCLUDES += common +#INCLUDES += common +#INCLUDES += algo/vpx_ref/cpu_id/include +#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 +ifeq ($(CONFIG_POSTPROC),yes) +VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h +VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/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-$(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-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes)) diff --git a/vp9/vp9cx_arm.mk b/vp9/vp9cx_arm.mk new file mode 100644 index 000000000..92dece33c --- /dev/null +++ b/vp9/vp9cx_arm.mk @@ -0,0 +1,63 @@ +## +## Copyright (c) 2010 The WebM project authors. All Rights Reserved. +## +## Use of this source code is governed by a BSD-style license +## that can be found in the LICENSE file in the root of the source +## tree. An additional intellectual property rights grant can be found +## in the file PATENTS. All contributing project authors may +## be found in the AUTHORS file in the root of the source tree. +## + + +#VP9_CX_SRCS list is modified according to different platforms. + +#File list for arm +# encoder +VP9_CX_SRCS-$(ARCH_ARM) += encoder/arm/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 + +#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/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) +VP9_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_partitions_armv5$(ASM) + +#File list for armv6 +# encoder +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_subtract_armv6$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_mse16x16_armv6$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance8x8_armv6$(ASM) +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/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) +VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/subtract_neon$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/variance_neon$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_mse16x16_neon$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance8x8_neon$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16_neon$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_memcpy_neon$(ASM) +VP9_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_shortwalsh4x4_neon$(ASM) diff --git a/vp9/vp9dx.mk b/vp9/vp9dx.mk new file mode 100644 index 000000000..dc9f2d390 --- /dev/null +++ b/vp9/vp9dx.mk @@ -0,0 +1,71 @@ +## +## Copyright (c) 2010 The WebM project authors. All Rights Reserved. +## +## Use of this source code is governed by a BSD-style license +## that can be found in the LICENSE file in the root of the source +## tree. An additional intellectual property rights grant can be found +## in the file PATENTS. All contributing project authors may +## be found in the AUTHORS file in the root of the source tree. +## + + +include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk + +VP9_DX_EXPORTS += exports_dec + +VP9_DX_SRCS-yes += $(VP9_COMMON_SRCS-yes) +VP9_DX_SRCS-no += $(VP9_COMMON_SRCS-no) +VP9_DX_SRCS_REMOVE-yes += $(VP9_COMMON_SRCS_REMOVE-yes) +VP9_DX_SRCS_REMOVE-no += $(VP9_COMMON_SRCS_REMOVE-no) + +ifeq ($(ARCH_ARM),yes) + include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx_arm.mk +endif + +VP9_DX_SRCS-yes += vp9_dx_iface.c + +# common +#define ARM +#define DISABLE_THREAD + +#INCLUDES += algo/vpx_common/vpx_mem/include +#INCLUDES += common +#INCLUDES += common +#INCLUDES += common +#INCLUDES += common +#INCLUDES += decoder + + + +# decoder +#define ARM +#define DISABLE_THREAD + +#INCLUDES += algo/vpx_common/vpx_mem/include +#INCLUDES += common +#INCLUDES += common +#INCLUDES += common +#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 := $(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 diff --git a/vp8/vp8dx_arm.mk b/vp9/vp9dx_arm.mk similarity index 100% rename from vp8/vp8dx_arm.mk rename to vp9/vp9dx_arm.mk diff --git a/vpx/vp8.h b/vpx/vp8.h index 0082ed8fc..1450efb67 100644 --- a/vpx/vp8.h +++ b/vpx/vp8.h @@ -28,8 +28,8 @@ /*!\file * \brief Provides controls common to both the VP8 encoder and decoder. */ -#ifndef VP8_H -#define VP8_H +#ifndef VP9_H +#define VP9_H #include "vpx_codec_impl_top.h" /*!\brief Control functions diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h index 6a0eaa286..193ae8049 100644 --- a/vpx/vp8cx.h +++ b/vpx/vp8cx.h @@ -20,8 +20,8 @@ * \brief Provides definitions for using the VP8 encoder algorithm within the * vpx Codec Interface. */ -#ifndef VP8CX_H -#define VP8CX_H +#ifndef VP9CX_H +#define VP9CX_H #include "vpx_config.h" #include "vpx_codec_impl_top.h" diff --git a/vpx/vp8dx.h b/vpx/vp8dx.h index 8ac0d9da9..b076f51ea 100644 --- a/vpx/vp8dx.h +++ b/vpx/vp8dx.h @@ -20,8 +20,8 @@ * \brief Provides definitions for using the VP8 algorithm within the vpx Decoder * interface. */ -#ifndef VP8DX_H -#define VP8DX_H +#ifndef VP9DX_H +#define VP9DX_H #include "vpx_codec_impl_top.h" /*!\name Algorithm interface for VP8 diff --git a/vpx/vp8e.h b/vpx/vp8e.h index 4dacb3cd7..00ff090a6 100644 --- a/vpx/vp8e.h +++ b/vpx/vp8e.h @@ -12,8 +12,8 @@ /* This file contains backwards compatibility stubs for applications using * the VP8 version 1.0 API. */ -#ifndef VP8E_H -#define VP8E_H +#ifndef VP9E_H +#define VP9E_H #include "vpx_codec_impl_top.h" #if defined(VPX_CODEC_DISABLE_COMPAT) && VPX_CODEC_DISABLE_COMPAT diff --git a/vpxdec.c b/vpxdec.c index 04d1ac7c5..9f20a9a9a 100644 --- a/vpxdec.c +++ b/vpxdec.c @@ -22,7 +22,7 @@ #include "vpx_config.h" #include "vpx/vpx_decoder.h" #include "vpx_ports/vpx_timer.h" -#if CONFIG_VP8_DECODER +#if CONFIG_VP9_DECODER #include "vpx/vp8dx.h" #endif #if CONFIG_MD5 @@ -56,8 +56,8 @@ static const struct { unsigned int fourcc; unsigned int fourcc_mask; } ifaces[] = { -#if CONFIG_VP8_DECODER - {"vp8", vpx_codec_vp8_dx, VP8_FOURCC, 0x00FFFFFF}, +#if CONFIG_VP9_DECODER + {"vp9", vpx_codec_vp8_dx, VP8_FOURCC, 0x00FFFFFF}, #endif }; @@ -104,7 +104,7 @@ static const arg_def_t *all_args[] = { NULL }; -#if CONFIG_VP8_DECODER +#if CONFIG_VP9_DECODER static const arg_def_t addnoise_level = ARG_DEF(NULL, "noise-level", 1, "Enable VP8 postproc add noise"); static const arg_def_t deblock = ARG_DEF(NULL, "deblock", 0, @@ -135,7 +135,7 @@ static void usage_exit() { fprintf(stderr, "Usage: %s filename\n\n" "Options:\n", exec_name); arg_show_usage(stderr, all_args); -#if CONFIG_VP8_DECODER +#if CONFIG_VP9_DECODER fprintf(stderr, "\nVP8 Postprocessing Options:\n"); arg_show_usage(stderr, vp8_pp_args); #endif @@ -684,7 +684,7 @@ int main(int argc, const char **argv_) { unsigned int fps_num; void *out = NULL; vpx_codec_dec_cfg_t cfg = {0}; -#if CONFIG_VP8_DECODER +#if CONFIG_VP9_DECODER vp8_postproc_cfg_t vp8_pp_cfg = {0}; int vp8_dbg_color_ref_frame = 0; int vp8_dbg_color_mb_modes = 0; @@ -744,7 +744,7 @@ int main(int argc, const char **argv_) { else if (arg_match(&arg, &verbosearg, argi)) quiet = 0; -#if CONFIG_VP8_DECODER +#if CONFIG_VP9_DECODER else if (arg_match(&arg, &addnoise_level, argi)) { postproc = 1; vp8_pp_cfg.post_proc_flag |= VP8_ADDNOISE; @@ -909,7 +909,7 @@ int main(int argc, const char **argv_) { if (!quiet) fprintf(stderr, "%s\n", decoder.name); -#if CONFIG_VP8_DECODER +#if CONFIG_VP9_DECODER if (vp8_pp_cfg.post_proc_flag && vpx_codec_control(&decoder, VP8_SET_POSTPROC, &vp8_pp_cfg)) { diff --git a/vpxenc.c b/vpxenc.c index 625977a4a..c52800661 100644 --- a/vpxenc.c +++ b/vpxenc.c @@ -82,8 +82,8 @@ static const struct { unsigned int fourcc; unsigned int fourcc_mask; } ifaces[] = { -#if CONFIG_VP8_DECODER - {"vp8", &vpx_codec_vp8_dx, VP8_FOURCC, 0x00FFFFFF}, +#if CONFIG_VP9_DECODER + {"vp9", &vpx_codec_vp8_dx, VP8_FOURCC, 0x00FFFFFF}, #endif }; @@ -93,8 +93,8 @@ static const struct codec_item { unsigned int fourcc; unsigned int fourcc_mask; } codecs[] = { -#if CONFIG_VP8_ENCODER - {"vp8", vpx_codec_vp8x_cx, VP8_FOURCC, 0x00FFFFFF}, +#if CONFIG_VP9_ENCODER + {"vp9", vpx_codec_vp8x_cx, VP8_FOURCC, 0x00FFFFFF}, #endif }; @@ -1011,7 +1011,7 @@ static const arg_def_t *kf_args[] = { }; -#if CONFIG_VP8_ENCODER +#if CONFIG_VP9_ENCODER static const arg_def_t noise_sens = ARG_DEF(NULL, "noise-sensitivity", 1, "Noise sensitivity (frames to blur)"); static const arg_def_t sharpness = ARG_DEF(NULL, "sharpness", 1, @@ -1020,13 +1020,13 @@ static const arg_def_t static_thresh = ARG_DEF(NULL, "static-thresh", 1, "Motion detection threshold"); #endif -#if CONFIG_VP8_ENCODER +#if CONFIG_VP9_ENCODER static const arg_def_t cpu_used = ARG_DEF(NULL, "cpu-used", 1, "CPU Used (-16..16)"); #endif -#if CONFIG_VP8_ENCODER +#if CONFIG_VP9_ENCODER static const arg_def_t token_parts = ARG_DEF(NULL, "token-parts", 1, "Number of token partitions to use, log2"); static const arg_def_t auto_altref = ARG_DEF(NULL, "auto-alt-ref", 1, @@ -1081,7 +1081,7 @@ static void usage_exit() { arg_show_usage(stdout, rc_twopass_args); fprintf(stderr, "\nKeyframe Placement Options:\n"); arg_show_usage(stdout, kf_args); -#if CONFIG_VP8_ENCODER +#if CONFIG_VP9_ENCODER fprintf(stderr, "\nVP8 Specific Options:\n"); arg_show_usage(stdout, vp8_args); #endif @@ -1659,7 +1659,7 @@ int main(int argc, const char **argv_) { #endif /* Handle codec specific options */ -#if CONFIG_VP8_ENCODER +#if CONFIG_VP9_ENCODER if (codec->fourcc == VP8_FOURCC) { ctrl_args = vp8_args;