diff options
| author | hkuang <hkuang@google.com> | 2013-06-19 15:33:45 -0700 |
|---|---|---|
| committer | hkuang <hkuang@google.com> | 2013-06-20 10:24:31 -0700 |
| commit | ba164dffc5a6795bce97fae02b51ccf3330e15e4 (patch) | |
| tree | 9b83fdf84e5bd8bb4d47ac37a7ea9ae3eef840b6 /libvpx/vp8/vp8dx.mk | |
| parent | ca15b5fc158a9df465aaf1acfe38d8cb5042c81b (diff) | |
| download | android_external_libvpx-ba164dffc5a6795bce97fae02b51ccf3330e15e4.tar.gz android_external_libvpx-ba164dffc5a6795bce97fae02b51ccf3330e15e4.tar.bz2 android_external_libvpx-ba164dffc5a6795bce97fae02b51ccf3330e15e4.zip | |
Updates libvpx to enable the VP9 decoder.
This change enables VP9 decoder for all build configurations.
Checkout is from master branch(hash:12180c8329d56d72e8d4424b8fd82b1b2f8e846a).
Change-Id: Ieaba85d0bc54e1ecdf9596398dafa03c43182f8c
Diffstat (limited to 'libvpx/vp8/vp8dx.mk')
| -rw-r--r-- | libvpx/vp8/vp8dx.mk | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/libvpx/vp8/vp8dx.mk b/libvpx/vp8/vp8dx.mk index dd39190..c26f42d 100644 --- a/libvpx/vp8/vp8dx.mk +++ b/libvpx/vp8/vp8dx.mk @@ -9,8 +9,6 @@ ## -include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk - VP8_DX_EXPORTS += exports_dec VP8_DX_SRCS-yes += $(VP8_COMMON_SRCS-yes) @@ -22,31 +20,6 @@ VP8_DX_SRCS-yes += vp8dx.mk 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 @@ -62,5 +35,9 @@ 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-$(CONFIG_MULTITHREAD) += decoder/threading.c +VP8_DX_SRCS-yes += decoder/vp8_asm_dec_offsets.c VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes)) + +$(eval $(call asm_offsets_template,\ + vp8_asm_dec_offsets.asm, $(VP8_PREFIX)decoder/vp8_asm_dec_offsets.c)) |