vp8: use official repository, update to latest version

This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-09-29 13:21:00 +02:00
parent 329833c3a9
commit 9321e8f170
5 changed files with 220 additions and 201 deletions

2
.gitmodules vendored
View file

@ -39,4 +39,4 @@
url = git://git.linphone.org/msamr url = git://git.linphone.org/msamr
[submodule "submodules/externals/libvpx"] [submodule "submodules/externals/libvpx"]
path = submodules/externals/libvpx path = submodules/externals/libvpx
url = git://git.linphone.org/libvpx.git url = http://git.chromium.org/webm/libvpx.git

View file

@ -4,215 +4,233 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libvpx LOCAL_MODULE := libvpx
LOCAL_CFLAGS := -O3 -fPIC -D_FORTIFY_SOURCE=0 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement -Wdisabled-optimization -Wpointer-arith -Wtype-limits -Wcast-qual -Wno-unused-function
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm
ASM := s ASM := .s
# vpx subfolder [vpx_codec.mk]
LOCAL_SRC_FILES = \
vpx/src/vpx_decoder.c \
vpx/src/vpx_decoder_compat.c \
vpx/src/vpx_encoder.c \
vpx/src/vpx_codec.c \
vpx/src/vpx_image.c
# vp8 subfolder [vp8_common.mk] ### vpx_mem.mk
LOCAL_SRC_FILES += \ MEM_SRCS = vpx_mem/vpx_mem.c
vp8/common/alloccommon.c \
vp8/common/blockd.c \
vp8/common/debugmodes.c \
vp8/common/defaultcoefcounts.c \
vp8/common/entropy.c \
vp8/common/entropymode.c \
vp8/common/entropymv.c \
vp8/common/extend.c \
vp8/common/filter.c \
vp8/common/findnearmv.c \
vp8/common/generic/systemdependent.c \
vp8/common/idctllm.c \
vp8/common/invtrans.c \
vp8/common/loopfilter.c \
vp8/common/loopfilter_filters.c \
vp8/common/mbpitch.c \
vp8/common/modecont.c \
vp8/common/modecontext.c \
vp8/common/quant_common.c \
vp8/common/recon.c \
vp8/common/reconinter.c \
vp8/common/reconintra.c \
vp8/common/reconintra4x4.c \
vp8/common/setupintrarecon.c \
vp8/common/swapyv12buffer.c \
vp8/common/treecoder.c \
vp8/common/asm_com_offsets.c \
vp8/common/arm/arm_systemdependent.c \
vp8/common/arm/bilinearfilter_arm.c \
vp8/common/arm/filter_arm.c \
vp8/common/arm/loopfilter_arm.c \
vp8/common/arm/reconintra_arm.c \
vp8/common/arm/neon/recon_neon.c.neon
ASM_FILES = \ ### vpx_scale
vp8/common/arm/armv6/bilinearfilter_v6.$(ASM) \ SCALE_SRCS = vpx_scale/generic/vpxscale.c
vp8/common/arm/armv6/copymem8x4_v6.$(ASM) \ SCALE_SRCS += vpx_scale/generic/yv12config.c
vp8/common/arm/armv6/copymem8x8_v6.$(ASM) \ SCALE_SRCS += vpx_scale/generic/yv12extend.c
vp8/common/arm/armv6/copymem16x16_v6.$(ASM) \ SCALE_SRCS += vpx_scale/generic/gen_scalers.c
vp8/common/arm/armv6/dc_only_idct_add_v6.$(ASM) \
vp8/common/arm/armv6/iwalsh_v6.$(ASM) \
vp8/common/arm/armv6/filter_v6.$(ASM) \
vp8/common/arm/armv6/idct_v6.$(ASM) \
vp8/common/arm/armv6/loopfilter_v6.$(ASM) \
vp8/common/arm/armv6/recon_v6.$(ASM) \
vp8/common/arm/armv6/simpleloopfilter_v6.$(ASM) \
vp8/common/arm/armv6/sixtappredict8x4_v6.$(ASM) \
vp8/common/arm/neon/bilinearpredict4x4_neon.$(ASM).neon \
vp8/common/arm/neon/bilinearpredict8x4_neon.$(ASM).neon \
vp8/common/arm/neon/bilinearpredict8x8_neon.$(ASM).neon \
vp8/common/arm/neon/bilinearpredict16x16_neon.$(ASM).neon \
vp8/common/arm/neon/copymem8x4_neon.$(ASM).neon \
vp8/common/arm/neon/copymem8x8_neon.$(ASM).neon \
vp8/common/arm/neon/copymem16x16_neon.$(ASM).neon \
vp8/common/arm/neon/dc_only_idct_add_neon.$(ASM).neon \
vp8/common/arm/neon/iwalsh_neon.$(ASM).neon \
vp8/common/arm/neon/loopfilter_neon.$(ASM).neon \
vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.$(ASM).neon \
vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.$(ASM).neon \
vp8/common/arm/neon/mbloopfilter_neon.$(ASM).neon \
vp8/common/arm/neon/recon2b_neon.$(ASM).neon \
vp8/common/arm/neon/recon4b_neon.$(ASM).neon \
vp8/common/arm/neon/reconb_neon.$(ASM).neon \
vp8/common/arm/neon/shortidct4x4llm_1_neon.$(ASM).neon \
vp8/common/arm/neon/shortidct4x4llm_neon.$(ASM).neon \
vp8/common/arm/neon/sixtappredict4x4_neon.$(ASM).neon \
vp8/common/arm/neon/sixtappredict8x4_neon.$(ASM).neon \
vp8/common/arm/neon/sixtappredict8x8_neon.$(ASM).neon \
vp8/common/arm/neon/sixtappredict16x16_neon.$(ASM).neon \
vp8/common/arm/neon/recon16x16mb_neon.$(ASM).neon \
vp8/common/arm/neon/buildintrapredictorsmby_neon.$(ASM).neon \
vp8/common/arm/neon/save_neon_reg.$(ASM).neon \
# vp8 subfolder [vp8cx.mk] #arm
LOCAL_SRC_FILES += \ SCALE_SRCS += vpx_scale/arm/scalesystemdependent.c
vp8/vp8_cx_iface.c \
vp8/encoder/asm_enc_offsets.c \
vp8/encoder/bitstream.c \
vp8/encoder/dct.c \
vp8/encoder/encodeframe.c \
vp8/encoder/encodeintra.c \
vp8/encoder/encodemb.c \
vp8/encoder/encodemv.c \
vp8/encoder/ethreading.c \
vp8/encoder/generic/csystemdependent.c \
vp8/encoder/lookahead.c \
vp8/encoder/mcomp.c \
vp8/encoder/modecosts.c \
vp8/encoder/onyx_if.c \
vp8/encoder/pickinter.c \
vp8/encoder/picklpf.c \
vp8/encoder/psnr.c \
vp8/encoder/quantize.c \
vp8/encoder/ratectrl.c \
vp8/encoder/rdopt.c \
vp8/encoder/sad_c.c \
vp8/encoder/segmentation.c \
vp8/encoder/tokenize.c \
vp8/encoder/treewriter.c \
vp8/encoder/variance_c.c
# vp8 subfolder [vp8cx_arm.mk] #neon
LOCAL_SRC_FILES += \ SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon$(ASM).neon
vp8/encoder/arm/arm_csystemdependent.c \ SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon$(ASM).neon
vp8/encoder/arm/quantize_arm.c \ SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon$(ASM).neon
vp8/encoder/arm/picklpf_arm.c \ SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon$(ASM).neon
vp8/encoder/arm/dct_arm.c \ SCALE_SRCS += vpx_scale/arm/neon/yv12extend_arm.c
vp8/encoder/arm/variance_arm.c \
vp8/encoder/arm/boolhuff_arm.c
ASM_FILES += \ ### vp8cx_arm
vp8/encoder/arm/armv5te/boolhuff_armv5te.$(ASM) \ #File list for arm
vp8/encoder/arm/armv5te/vp8_packtokens_armv5.$(ASM) \ # encoder
vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.$(ASM) \ VP8_CX_SRCS = vp8/encoder/arm/arm_csystemdependent.c
vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.$(ASM) \
vp8/encoder/arm/armv6/vp8_subtract_armv6.$(ASM) \
vp8/encoder/arm/armv6/vp8_fast_fdct4x4_armv6.$(ASM) \
vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.$(ASM) \
vp8/encoder/arm/armv6/vp8_sad16x16_armv6.$(ASM) \
vp8/encoder/arm/armv6/vp8_variance16x16_armv6.$(ASM) \
vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.$(ASM) \
vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.$(ASM) \
vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.$(ASM) \
vp8/encoder/arm/armv6/vp8_mse16x16_armv6.$(ASM) \
vp8/encoder/arm/armv6/vp8_variance8x8_armv6.$(ASM) \
vp8/encoder/arm/armv6/walsh_v6.$(ASM) \
vp8/encoder/arm/neon/fastfdct4x4_neon.$(ASM).neon \
vp8/encoder/arm/neon/fastfdct8x4_neon.$(ASM).neon \
vp8/encoder/arm/neon/fastquantizeb_neon.$(ASM).neon \
vp8/encoder/arm/neon/sad8_neon.$(ASM).neon \
vp8/encoder/arm/neon/sad16_neon.$(ASM).neon \
vp8/encoder/arm/neon/shortfdct_neon.$(ASM).neon \
vp8/encoder/arm/neon/subtract_neon.$(ASM).neon \
vp8/encoder/arm/neon/variance_neon.$(ASM).neon \
vp8/encoder/arm/neon/vp8_mse16x16_neon.$(ASM).neon \
vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon.$(ASM).neon \
vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.$(ASM).neon \
vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon.$(ASM).neon \
vp8/encoder/arm/neon/vp8_memcpy_neon.$(ASM).neon \
vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.$(ASM).neon \
# vp8 subfolder [vp8dx.mk] VP8_CX_SRCS += vp8/encoder/arm/dct_arm.c
LOCAL_SRC_FILES += \ VP8_CX_SRCS += vp8/encoder/arm/quantize_arm.c
vp8/vp8_dx_iface.c \ VP8_CX_SRCS += vp8/encoder/arm/variance_arm.c
vp8/decoder/dboolhuff.c \
vp8/decoder/decodemv.c \
vp8/decoder/decodframe.c \
vp8/decoder/dequantize.c \
vp8/decoder/detokenize.c \
vp8/decoder/error_concealment.c \
vp8/decoder/generic/dsystemdependent.c \
vp8/decoder/onyxd_if.c \
vp8/decoder/idct_blk.c \
vp8/decoder/threading.c \
vp8/decoder/reconintra_mt.c
# vp8 subfolder [vp8dx_arm.mk] #File list for armv5te
LOCAL_SRC_FILES += \ # encoder
vp8/decoder/arm/arm_dsystemdependent.c \ VP8_CX_SRCS += vp8/encoder/arm/boolhuff_arm.c
vp8/decoder/asm_dec_offsets.c \ VP8_CX_SRCS += vp8/encoder/arm/armv5te/boolhuff_armv5te$(ASM)
vp8/decoder/arm/dequantize_arm.c \ VP8_CX_SRCS += vp8/encoder/arm/armv5te/vp8_packtokens_armv5$(ASM)
vp8/decoder/arm/neon/idct_blk_neon.c.neon \ VP8_CX_SRCS += vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5$(ASM)
vp8/decoder/arm/armv6/idct_blk_v6.c VP8_CX_SRCS += vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5$(ASM)
ASM_FILES += \ #File list for armv6
vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon.$(ASM).neon \ # encoder
vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon.$(ASM).neon \ VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_subtract_armv6$(ASM)
vp8/decoder/arm/neon/dequant_idct_neon.$(ASM).neon \ VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM)
vp8/decoder/arm/neon/idct_dequant_full_2x_neon.$(ASM).neon \ VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM)
vp8/decoder/arm/neon/idct_dequant_0_2x_neon.$(ASM).neon \ VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_sad16x16_armv6$(ASM)
vp8/decoder/arm/neon/dequantizeb_neon.$(ASM).neon \ VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_variance16x16_armv6$(ASM)
vp8/decoder/arm/armv6/dequant_dc_idct_v6.$(ASM) \ VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM)
vp8/decoder/arm/armv6/dequant_idct_v6.$(ASM) \ VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM)
vp8/decoder/arm/armv6/dequantize_v6.$(ASM) VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM)
VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_mse16x16_armv6$(ASM)
VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_variance8x8_armv6$(ASM)
VP8_CX_SRCS += vp8/encoder/arm/armv6/walsh_v6$(ASM)
# vpx_mem subfolder [vpx_mem.mk] #File list for neon
LOCAL_SRC_FILES += vpx_mem/vpx_mem.c # encoder
VP8_CX_SRCS += vp8/encoder/arm/neon/fastquantizeb_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/picklpf_arm.c.neon
VP8_CX_SRCS += vp8/encoder/arm/neon/sad8_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/sad16_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/shortfdct_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/subtract_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/variance_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/vp8_mse16x16_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/vp8_subpixelvariance8x8_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/vp8_memcpy_neon$(ASM).neon
VP8_CX_SRCS += vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon$(ASM).neon
# vpx_scale subfolder [vpx_scale.mk] ### vp8_cx
LOCAL_SRC_FILES += \ VP8_CX_SRCS += vp8/vp8_cx_iface.c
vpx_scale/generic/vpxscale.c \
vpx_scale/generic/yv12config.c \ VP8_CX_SRCS += vp8/encoder/asm_enc_offsets.c
vpx_scale/generic/yv12extend.c \ VP8_CX_SRCS += vp8/encoder/bitstream.c
vpx_scale/arm/scalesystemdependent.c \ VP8_CX_SRCS += vp8/encoder/dct.c
vpx_scale/arm/yv12extend_arm.c \ VP8_CX_SRCS += vp8/encoder/encodeframe.c
vpx_scale/generic/scalesystemdependent.c VP8_CX_SRCS += vp8/encoder/encodeintra.c
ASM_FILES += \ VP8_CX_SRCS += vp8/encoder/encodemb.c
vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.$(ASM).neon \ VP8_CX_SRCS += vp8/encoder/encodemv.c
vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.$(ASM).neon \ #VP8_CX_SRCS += vp8/encoder/ethreading.c
vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.$(ASM).neon \ VP8_CX_SRCS += vp8/encoder/generic/csystemdependent.c
vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.$(ASM).neon \ VP8_CX_SRCS += vp8/encoder/lookahead.c
VP8_CX_SRCS += vp8/encoder/mcomp.c
VP8_CX_SRCS += vp8/encoder/modecosts.c
VP8_CX_SRCS += vp8/encoder/onyx_if.c
VP8_CX_SRCS += vp8/encoder/pickinter.c
VP8_CX_SRCS += vp8/encoder/picklpf.c
VP8_CX_SRCS += vp8/encoder/psnr.c
VP8_CX_SRCS += vp8/encoder/quantize.c
VP8_CX_SRCS += vp8/encoder/ratectrl.c
VP8_CX_SRCS += vp8/encoder/rdopt.c
VP8_CX_SRCS += vp8/encoder/sad_c.c
VP8_CX_SRCS += vp8/encoder/segmentation.c
VP8_CX_SRCS += vp8/encoder/tokenize.c
VP8_CX_SRCS += vp8/encoder/treewriter.c
VP8_CX_SRCS += vp8/encoder/variance_c.c
### vp8_common
VP8_COMMON_SRCS = vp8/common/alloccommon.c
VP8_COMMON_SRCS += vp8/common/asm_com_offsets.c
VP8_COMMON_SRCS += vp8/common/blockd.c
VP8_COMMON_SRCS += vp8/common/debugmodes.c
VP8_COMMON_SRCS += vp8/common/entropy.c
VP8_COMMON_SRCS += vp8/common/entropymode.c
VP8_COMMON_SRCS += vp8/common/entropymv.c
VP8_COMMON_SRCS += vp8/common/extend.c
VP8_COMMON_SRCS += vp8/common/filter.c
VP8_COMMON_SRCS += vp8/common/findnearmv.c
VP8_COMMON_SRCS += vp8/common/generic/systemdependent.c
VP8_COMMON_SRCS += vp8/common/idctllm.c
VP8_COMMON_SRCS += vp8/common/invtrans.c
VP8_COMMON_SRCS += vp8/common/loopfilter.c
VP8_COMMON_SRCS += vp8/common/loopfilter_filters.c
VP8_COMMON_SRCS += vp8/common/mbpitch.c
VP8_COMMON_SRCS += vp8/common/modecont.c
VP8_COMMON_SRCS += vp8/common/modecontext.c
VP8_COMMON_SRCS += vp8/common/quant_common.c
VP8_COMMON_SRCS += vp8/common/recon.c
VP8_COMMON_SRCS += vp8/common/reconinter.c
VP8_COMMON_SRCS += vp8/common/reconintra.c
VP8_COMMON_SRCS += vp8/common/reconintra4x4.c
VP8_COMMON_SRCS += vp8/common/setupintrarecon.c
VP8_COMMON_SRCS += vp8/common/swapyv12buffer.c
VP8_COMMON_SRCS += vp8/common/treecoder.c
# common (c)
VP8_COMMON_SRCS += vp8/common/arm/arm_systemdependent.c
VP8_COMMON_SRCS += vp8/common/arm/bilinearfilter_arm.c
VP8_COMMON_SRCS += vp8/common/arm/filter_arm.c
VP8_COMMON_SRCS += vp8/common/arm/loopfilter_arm.c
VP8_COMMON_SRCS += vp8/common/arm/reconintra_arm.c
# common (armv6)
VP8_COMMON_SRCS += vp8/common/arm/armv6/bilinearfilter_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/copymem8x4_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/copymem8x8_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/copymem16x16_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/dc_only_idct_add_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/iwalsh_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/filter_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/idct_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/loopfilter_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/recon_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/simpleloopfilter_v6$(ASM)
VP8_COMMON_SRCS += vp8/common/arm/armv6/sixtappredict8x4_v6$(ASM)
# common (neon)
VP8_COMMON_SRCS += vp8/common/arm/neon/bilinearpredict4x4_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/bilinearpredict8x4_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/bilinearpredict8x8_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/bilinearpredict16x16_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/copymem8x4_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/copymem8x8_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/copymem16x16_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/dc_only_idct_add_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/iwalsh_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/loopfilter_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/loopfiltersimpleverticaledge_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/mbloopfilter_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/recon2b_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/recon4b_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/reconb_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/shortidct4x4llm_1_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/shortidct4x4llm_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict4x4_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict8x4_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict8x8_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict16x16_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/recon16x16mb_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/buildintrapredictorsmby_neon$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/save_neon_reg$(ASM).neon
VP8_COMMON_SRCS += vp8/common/arm/neon/recon_neon.c.neon
### vp8dx_arm
VP8_DX_SRCS = vp8/decoder/arm/arm_dsystemdependent.c
VP8_DX_SRCS += vp8/decoder/arm/dequantize_arm.c
#File list for armv6
VP8_DX_SRCS += vp8/decoder/arm/armv6/dequant_dc_idct_v6$(ASM)
VP8_DX_SRCS += vp8/decoder/arm/armv6/dequant_idct_v6$(ASM)
VP8_DX_SRCS += vp8/decoder/arm/armv6/dequantize_v6$(ASM)
VP8_DX_SRCS += vp8/decoder/arm/armv6/idct_blk_v6.c
#File list for neon
VP8_DX_SRCS += vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon$(ASM).neon
VP8_DX_SRCS += vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon$(ASM).neon
VP8_DX_SRCS += vp8/decoder/arm/neon/dequant_idct_neon$(ASM).neon
VP8_DX_SRCS += vp8/decoder/arm/neon/idct_dequant_full_2x_neon$(ASM).neon
VP8_DX_SRCS += vp8/decoder/arm/neon/idct_dequant_0_2x_neon$(ASM).neon
VP8_DX_SRCS += vp8/decoder/arm/neon/dequantizeb_neon$(ASM).neon
VP8_DX_SRCS += vp8/decoder/arm/neon/idct_blk_neon.c.neon
### vp8dx
VP8_DX_SRCS += vp8/vp8_dx_iface.c
VP8_DX_SRCS += vp8/decoder/asm_dec_offsets.c
VP8_DX_SRCS += vp8/decoder/dboolhuff.c
VP8_DX_SRCS += vp8/decoder/decodemv.c
VP8_DX_SRCS += vp8/decoder/decodframe.c
VP8_DX_SRCS += vp8/decoder/dequantize.c
VP8_DX_SRCS += vp8/decoder/detokenize.c
VP8_DX_SRCS += vp8/decoder/error_concealment.c
VP8_DX_SRCS += vp8/decoder/generic/dsystemdependent.c
VP8_DX_SRCS += vp8/decoder/onyxd_if.c
#VP8_DX_SRCS += vp8/decoder/threading.c
VP8_DX_SRCS += vp8/decoder/idct_blk.c
#VP8_DX_SRCS += vp8/decoder/reconintra_mt.c
### vpx_codec
API_SRCS = vpx/src/vpx_decoder.c
API_SRCS += vpx/src/vpx_decoder_compat.c
API_SRCS += vpx/src/vpx_encoder.c
API_SRCS += vpx/src/vpx_codec.c
API_SRCS += vpx/src/vpx_image.c
LOCAL_SRC_FILES = $(MEM_SRCS)
LOCAL_SRC_FILES += $(SCALE_SRCS)
LOCAL_SRC_FILES += $(VP8_CX_SRCS)
LOCAL_SRC_FILES += $(VP8_COMMON_SRCS)
LOCAL_SRC_FILES += $(VP8_DX_SRCS)
LOCAL_SRC_FILES += $(API_SRCS)
LOCAL_SRC_FILES += vpx_ports/arm_cpudetect.c LOCAL_SRC_FILES += vpx_ports/arm_cpudetect.c
LOCAL_SRC_FILES += $(ASM_FILES)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \

View file

@ -1,7 +1,7 @@
/* This file automatically generated by configure. Do not edit! */ /* This file automatically generated by configure. Do not edit! */
#ifndef VPX_CONFIG_H #ifndef VPX_CONFIG_H
#define VPX_CONFIG_H #define VPX_CONFIG_H
#define RESTRICT #define RESTRICT
#define ARCH_ARM 1 #define ARCH_ARM 1
#define ARCH_MIPS 0 #define ARCH_MIPS 0
#define ARCH_X86 0 #define ARCH_X86 0
@ -63,6 +63,7 @@
#define CONFIG_REALTIME_ONLY 1 #define CONFIG_REALTIME_ONLY 1
#define CONFIG_ERROR_CONCEALMENT 1 #define CONFIG_ERROR_CONCEALMENT 1
#define CONFIG_SHARED 0 #define CONFIG_SHARED 0
#define CONFIG_STATIC 1
#define CONFIG_SMALL 0 #define CONFIG_SMALL 0
#define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1 #define CONFIG_OS_SUPPORT 1

View file

@ -1,7 +1,7 @@
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 9 #define VERSION_MINOR 9
#define VERSION_PATCH 6 #define VERSION_PATCH 7
#define VERSION_EXTRA "" #define VERSION_EXTRA "p1-55-g6f9457e"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v0.9.6" #define VERSION_STRING_NOSP "v0.9.7-p1-55-g6f9457e"
#define VERSION_STRING " v0.9.6" #define VERSION_STRING " v0.9.7-p1-55-g6f9457e"

@ -1 +1 @@
Subproject commit b84e8f20c3aca0f2a65265cf704cc7c15a2c93d4 Subproject commit 6f9457ec12a98b3aceefbcb79783c084268d0b36