Commit 3d26d916 authored by Yaowu Xu's avatar Yaowu Xu

libvpx -> libaom

Change-Id: I820483aefdc14f2ae946e08fe10fa01f3e845767
parent 244fb2c6
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
/ivfdec.dox /ivfdec.dox
/ivfenc /ivfenc
/ivfenc.dox /ivfenc.dox
/libvpx.so* /libaom.so*
/libvpx.ver /libaom.ver
/samples.dox /samples.dox
/test_intra_pred_speed /test_intra_pred_speed
/test_libvpx /test_libaom
/vp8_api1_migration.dox /vp8_api1_migration.dox
/vp[89x]_rtcd.h /vp[89x]_rtcd.h
/vpx.pc /vpx.pc
......
...@@ -219,10 +219,10 @@ typedef vpx_image_t *(*vpx_codec_get_frame_fn_t)(vpx_codec_alg_priv_t *ctx, ...@@ -219,10 +219,10 @@ typedef vpx_image_t *(*vpx_codec_get_frame_fn_t)(vpx_codec_alg_priv_t *ctx,
/*!\brief Pass in external frame buffers for the decoder to use. /*!\brief Pass in external frame buffers for the decoder to use.
* *
* Registers functions to be called when libvpx needs a frame buffer * Registers functions to be called when libaom needs a frame buffer
* to decode the current frame and a function to be called when libvpx does * to decode the current frame and a function to be called when libaom does
* not internally reference the frame buffer. This set function must * not internally reference the frame buffer. This set function must
* be called before the first call to decode or libvpx will assume the * be called before the first call to decode or libaom will assume the
* default behavior of allocating frame buffers internally. * default behavior of allocating frame buffers internally.
* *
* \param[in] ctx Pointer to this instance's context * \param[in] ctx Pointer to this instance's context
...@@ -231,7 +231,7 @@ typedef vpx_image_t *(*vpx_codec_get_frame_fn_t)(vpx_codec_alg_priv_t *ctx, ...@@ -231,7 +231,7 @@ typedef vpx_image_t *(*vpx_codec_get_frame_fn_t)(vpx_codec_alg_priv_t *ctx,
* \param[in] cb_priv Callback's private data * \param[in] cb_priv Callback's private data
* *
* \retval #VPX_CODEC_OK * \retval #VPX_CODEC_OK
* External frame buffers will be used by libvpx. * External frame buffers will be used by libaom.
* \retval #VPX_CODEC_INVALID_PARAM * \retval #VPX_CODEC_INVALID_PARAM
* One or more of the callbacks were NULL. * One or more of the callbacks were NULL.
* \retval #VPX_CODEC_ERROR * \retval #VPX_CODEC_ERROR
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
/** /**
* @file * @file
* VP9 SVC encoding support via libvpx * VP9 SVC encoding support via libaom
*/ */
#include <assert.h> #include <assert.h>
......
...@@ -327,10 +327,10 @@ vpx_codec_err_t vpx_codec_register_put_slice_cb(vpx_codec_ctx_t *ctx, ...@@ -327,10 +327,10 @@ vpx_codec_err_t vpx_codec_register_put_slice_cb(vpx_codec_ctx_t *ctx,
/*!\brief Pass in external frame buffers for the decoder to use. /*!\brief Pass in external frame buffers for the decoder to use.
* *
* Registers functions to be called when libvpx needs a frame buffer * Registers functions to be called when libaom needs a frame buffer
* to decode the current frame and a function to be called when libvpx does * to decode the current frame and a function to be called when libaom does
* not internally reference the frame buffer. This set function must * not internally reference the frame buffer. This set function must
* be called before the first call to decode or libvpx will assume the * be called before the first call to decode or libaom will assume the
* default behavior of allocating frame buffers internally. * default behavior of allocating frame buffers internally.
* *
* \param[in] ctx Pointer to this instance's context * \param[in] ctx Pointer to this instance's context
...@@ -339,7 +339,7 @@ vpx_codec_err_t vpx_codec_register_put_slice_cb(vpx_codec_ctx_t *ctx, ...@@ -339,7 +339,7 @@ vpx_codec_err_t vpx_codec_register_put_slice_cb(vpx_codec_ctx_t *ctx,
* \param[in] cb_priv Callback's private data * \param[in] cb_priv Callback's private data
* *
* \retval #VPX_CODEC_OK * \retval #VPX_CODEC_OK
* External frame buffers will be used by libvpx. * External frame buffers will be used by libaom.
* \retval #VPX_CODEC_INVALID_PARAM * \retval #VPX_CODEC_INVALID_PARAM
* One or more of the callbacks were NULL. * One or more of the callbacks were NULL.
* \retval #VPX_CODEC_ERROR * \retval #VPX_CODEC_ERROR
......
...@@ -21,7 +21,7 @@ extern "C" { ...@@ -21,7 +21,7 @@ extern "C" {
#include "./vpx_integer.h" #include "./vpx_integer.h"
/*!\brief The maximum number of work buffers used by libvpx. /*!\brief The maximum number of work buffers used by libaom.
* Support maximum 4 threads to decode video in parallel. * Support maximum 4 threads to decode video in parallel.
* Each thread will use one work buffer. * Each thread will use one work buffer.
* TODO(hkuang): Add support to set number of worker threads dynamically. * TODO(hkuang): Add support to set number of worker threads dynamically.
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
movsxd rax, dword ptr arg(1) ; src_stride movsxd rax, dword ptr arg(1) ; src_stride
movsxd rdx, dword ptr arg(3) ; ref_stride movsxd rdx, dword ptr arg(3) ; ref_stride
%else %else
%if LIBVPX_YASM_WIN64 %if LIBAOM_YASM_WIN64
SAVE_XMM 7, u SAVE_XMM 7, u
%define src_ptr rcx %define src_ptr rcx
%define src_stride rdx %define src_stride rdx
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
pop rsi pop rsi
pop rbp pop rbp
%else %else
%if LIBVPX_YASM_WIN64 %if LIBAOM_YASM_WIN64
RESTORE_XMM RESTORE_XMM
%endif %endif
%endif %endif
......
...@@ -18,7 +18,7 @@ sym(vpx_reset_mmx_state): ...@@ -18,7 +18,7 @@ sym(vpx_reset_mmx_state):
ret ret
%if LIBVPX_YASM_WIN64 %if LIBAOM_YASM_WIN64
global sym(vpx_winx64_fldcw) PRIVATE global sym(vpx_winx64_fldcw) PRIVATE
sym(vpx_winx64_fldcw): sym(vpx_winx64_fldcw):
sub rsp, 8 sub rsp, 8
......
...@@ -78,15 +78,15 @@ ...@@ -78,15 +78,15 @@
%endif %endif
; LIBVPX_YASM_WIN64 ; LIBAOM_YASM_WIN64
; Set LIBVPX_YASM_WIN64 if output is Windows 64bit so the code will work if x64 ; Set LIBAOM_YASM_WIN64 if output is Windows 64bit so the code will work if x64
; or win64 is defined on the Yasm command line. ; or win64 is defined on the Yasm command line.
%ifidn __OUTPUT_FORMAT__,win64 %ifidn __OUTPUT_FORMAT__,win64
%define LIBVPX_YASM_WIN64 1 %define LIBAOM_YASM_WIN64 1
%elifidn __OUTPUT_FORMAT__,x64 %elifidn __OUTPUT_FORMAT__,x64
%define LIBVPX_YASM_WIN64 1 %define LIBAOM_YASM_WIN64 1
%else %else
%define LIBVPX_YASM_WIN64 0 %define LIBAOM_YASM_WIN64 0
%endif %endif
; sym() ; sym()
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
%define sym(x) x %define sym(x) x
%elifidn __OUTPUT_FORMAT__,elfx32 %elifidn __OUTPUT_FORMAT__,elfx32
%define sym(x) x %define sym(x) x
%elif LIBVPX_YASM_WIN64 %elif LIBAOM_YASM_WIN64
%define sym(x) x %define sym(x) x
%else %else
%define sym(x) _ %+ x %define sym(x) _ %+ x
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
%define PRIVATE :hidden %define PRIVATE :hidden
%elifidn __OUTPUT_FORMAT__,elfx32 %elifidn __OUTPUT_FORMAT__,elfx32
%define PRIVATE :hidden %define PRIVATE :hidden
%elif LIBVPX_YASM_WIN64 %elif LIBAOM_YASM_WIN64
%define PRIVATE %define PRIVATE
%else %else
%define PRIVATE :private_extern %define PRIVATE :private_extern
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
%else %else
; 64 bit ABI passes arguments in registers. This is a workaround to get up ; 64 bit ABI passes arguments in registers. This is a workaround to get up
; and running quickly. Relies on SHADOW_ARGS_TO_STACK ; and running quickly. Relies on SHADOW_ARGS_TO_STACK
%if LIBVPX_YASM_WIN64 %if LIBAOM_YASM_WIN64
%define arg(x) [rbp+16+8*x] %define arg(x) [rbp+16+8*x]
%else %else
%define arg(x) [rbp-8-8*x] %define arg(x) [rbp-8-8*x]
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
%endm %endm
%define UNSHADOW_ARGS %define UNSHADOW_ARGS
%else %else
%if LIBVPX_YASM_WIN64 %if LIBAOM_YASM_WIN64
%macro SHADOW_ARGS_TO_STACK 1 ; argc %macro SHADOW_ARGS_TO_STACK 1 ; argc
%if %1 > 0 %if %1 > 0
mov arg(0),rcx mov arg(0),rcx
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
; Win64 ABI requires 16 byte stack alignment, but then pushes an 8 byte return ; Win64 ABI requires 16 byte stack alignment, but then pushes an 8 byte return
; value. Typically we follow this up with 'push rbp' - re-aligning the stack - ; value. Typically we follow this up with 'push rbp' - re-aligning the stack -
; but in some cases this is not done and unaligned movs must be used. ; but in some cases this is not done and unaligned movs must be used.
%if LIBVPX_YASM_WIN64 %if LIBAOM_YASM_WIN64
%macro SAVE_XMM 1-2 a %macro SAVE_XMM 1-2 a
%if %1 < 6 %if %1 < 6
%error Only xmm registers 6-15 must be preserved %error Only xmm registers 6-15 must be preserved
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
int vpx_yv12_de_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf) { int vpx_yv12_de_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf) {
if (ybf) { if (ybf) {
// If libvpx is using frame buffer callbacks then buffer_alloc_sz must // If libaom is using frame buffer callbacks then buffer_alloc_sz must
// not be set. // not be set.
if (ybf->buffer_alloc_sz > 0) { if (ybf->buffer_alloc_sz > 0) {
vpx_free(ybf->buffer_alloc); vpx_free(ybf->buffer_alloc);
......
...@@ -215,7 +215,7 @@ void vpx_yv12_copy_frame_c(const YV12_BUFFER_CONFIG *src_ybc, ...@@ -215,7 +215,7 @@ void vpx_yv12_copy_frame_c(const YV12_BUFFER_CONFIG *src_ybc,
uint8_t *dst = dst_ybc->y_buffer; uint8_t *dst = dst_ybc->y_buffer;
#if 0 #if 0
/* These assertions are valid in the codec, but the libvpx-tester uses /* These assertions are valid in the codec, but the libaom-tester uses
* this code slightly differently. * this code slightly differently.
*/ */
assert(src_ybc->y_width == dst_ybc->y_width); assert(src_ybc->y_width == dst_ybc->y_width);
......
...@@ -81,9 +81,9 @@ int vpx_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height, ...@@ -81,9 +81,9 @@ int vpx_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height,
// Updates the yv12 buffer config with the frame buffer. |byte_alignment| must // Updates the yv12 buffer config with the frame buffer. |byte_alignment| must
// be a power of 2, from 32 to 1024. 0 sets legacy alignment. If cb is not // be a power of 2, from 32 to 1024. 0 sets legacy alignment. If cb is not
// NULL, then libvpx is using the frame buffer callbacks to handle memory. // NULL, then libaom is using the frame buffer callbacks to handle memory.
// If cb is not NULL, libvpx will call cb with minimum size in bytes needed // If cb is not NULL, libaom will call cb with minimum size in bytes needed
// to decode the current frame. If cb is NULL, libvpx will allocate memory // to decode the current frame. If cb is NULL, libaom will allocate memory
// internally to decode the current frame. Returns 0 on success. Returns < 0 // internally to decode the current frame. Returns 0 on success. Returns < 0
// on failure. // on failure.
int vpx_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height, int vpx_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height,
......
...@@ -35,14 +35,14 @@ int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list); ...@@ -35,14 +35,14 @@ int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list);
// Free any data allocated to the frame buffers. // Free any data allocated to the frame buffers.
void vp10_free_internal_frame_buffers(InternalFrameBufferList *list); void vp10_free_internal_frame_buffers(InternalFrameBufferList *list);
// Callback used by libvpx to request an external frame buffer. |cb_priv| // Callback used by libaom to request an external frame buffer. |cb_priv|
// Callback private data, which points to an InternalFrameBufferList. // Callback private data, which points to an InternalFrameBufferList.
// |min_size| is the minimum size in bytes needed to decode the next frame. // |min_size| is the minimum size in bytes needed to decode the next frame.
// |fb| pointer to the frame buffer. // |fb| pointer to the frame buffer.
int vp10_get_frame_buffer(void *cb_priv, size_t min_size, int vp10_get_frame_buffer(void *cb_priv, size_t min_size,
vpx_codec_frame_buffer_t *fb); vpx_codec_frame_buffer_t *fb);
// Callback used by libvpx when there are no references to the frame buffer. // Callback used by libaom when there are no references to the frame buffer.
// |cb_priv| is not used. |fb| pointer to the frame buffer. // |cb_priv| is not used. |fb| pointer to the frame buffer.
int vp10_release_frame_buffer(void *cb_priv, vpx_codec_frame_buffer_t *fb); int vp10_release_frame_buffer(void *cb_priv, vpx_codec_frame_buffer_t *fb);
......
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
## ##
# #
# This file is to be used for compiling libvpx for Android using the NDK. # This file is to be used for compiling libaom for Android using the NDK.
# In an Android project place a libvpx checkout in the jni directory. # In an Android project place a libaom checkout in the jni directory.
# Run the configure script from the jni directory. Base libvpx # Run the configure script from the jni directory. Base libaom
# encoder/decoder configuration will look similar to: # encoder/decoder configuration will look similar to:
# ./libvpx/configure --target=armv7-android-gcc --disable-examples \ # ./libaom/configure --target=armv7-android-gcc --disable-examples \
# --sdk-path=/opt/android-ndk-r6b/ # --sdk-path=/opt/android-ndk-r6b/
# #
# When targeting Android, realtime-only is enabled by default. This can # When targeting Android, realtime-only is enabled by default. This can
...@@ -24,33 +24,33 @@ ...@@ -24,33 +24,33 @@
# source files to compile. # source files to compile.
# #
# Place an Android.mk file in the jni directory that references the # Place an Android.mk file in the jni directory that references the
# Android.mk file in the libvpx directory: # Android.mk file in the libaom directory:
# LOCAL_PATH := $(call my-dir) # LOCAL_PATH := $(call my-dir)
# include $(CLEAR_VARS) # include $(CLEAR_VARS)
# include jni/libvpx/build/make/Android.mk # include jni/libaom/build/make/Android.mk
# #
# There are currently two TARGET_ARCH_ABI targets for ARM. # There are currently two TARGET_ARCH_ABI targets for ARM.
# armeabi and armeabi-v7a. armeabi-v7a is selected by creating an # armeabi and armeabi-v7a. armeabi-v7a is selected by creating an
# Application.mk in the jni directory that contains: # Application.mk in the jni directory that contains:
# APP_ABI := armeabi-v7a # APP_ABI := armeabi-v7a
# #
# By default libvpx will detect at runtime the existance of NEON extension. # By default libaom will detect at runtime the existance of NEON extension.
# For this we import the 'cpufeatures' module from the NDK sources. # For this we import the 'cpufeatures' module from the NDK sources.
# libvpx can also be configured without this runtime detection method. # libaom can also be configured without this runtime detection method.
# Configuring with --disable-runtime-cpu-detect will assume presence of NEON. # Configuring with --disable-runtime-cpu-detect will assume presence of NEON.
# Configuring with --disable-runtime-cpu-detect --disable-neon \ # Configuring with --disable-runtime-cpu-detect --disable-neon \
# --disable-neon-asm # --disable-neon-asm
# will remove any NEON dependency. # will remove any NEON dependency.
# To change to building armeabi, run ./libvpx/configure again, but with # To change to building armeabi, run ./libaom/configure again, but with
# --target=armv6-android-gcc and modify the Application.mk file to # --target=armv6-android-gcc and modify the Application.mk file to
# set APP_ABI := armeabi # set APP_ABI := armeabi
# #
# Running ndk-build will build libvpx and include it in your project. # Running ndk-build will build libaom and include it in your project.
# #
CONFIG_DIR := $(LOCAL_PATH)/ CONFIG_DIR := $(LOCAL_PATH)/
LIBVPX_PATH := $(LOCAL_PATH)/libvpx LIBAOM_PATH := $(LOCAL_PATH)/libaom
ASM_CNV_PATH_LOCAL := $(TARGET_ARCH_ABI)/ads2gas ASM_CNV_PATH_LOCAL := $(TARGET_ARCH_ABI)/ads2gas
ASM_CNV_PATH := $(LOCAL_PATH)/$(ASM_CNV_PATH_LOCAL) ASM_CNV_PATH := $(LOCAL_PATH)/$(ASM_CNV_PATH_LOCAL)
...@@ -75,26 +75,26 @@ else ...@@ -75,26 +75,26 @@ else
$(error Not a supported TARGET_ARCH_ABI: $(TARGET_ARCH_ABI)) $(error Not a supported TARGET_ARCH_ABI: $(TARGET_ARCH_ABI))
endif endif
# Rule that is normally in Makefile created by libvpx # Rule that is normally in Makefile created by libaom
# configure. Used to filter out source files based on configuration. # configure. Used to filter out source files based on configuration.
enabled=$(filter-out $($(1)-no),$($(1)-yes)) enabled=$(filter-out $($(1)-no),$($(1)-yes))
# Override the relative path that is defined by the libvpx # Override the relative path that is defined by the libaom
# configure process # configure process
SRC_PATH_BARE := $(LIBVPX_PATH) SRC_PATH_BARE := $(LIBAOM_PATH)
# Include the list of files to be built # Include the list of files to be built
include $(LIBVPX_PATH)/libs.mk include $(LIBAOM_PATH)/libs.mk
# Optimise the code. May want to revisit this setting in the future. # Optimise the code. May want to revisit this setting in the future.
LOCAL_CFLAGS := -O3 LOCAL_CFLAGS := -O3
# For x86, include the source code in the search path so it will find files # For x86, include the source code in the search path so it will find files
# like x86inc.asm and x86_abi_support.asm # like x86inc.asm and x86_abi_support.asm
LOCAL_ASMFLAGS := -I$(LIBVPX_PATH) LOCAL_ASMFLAGS := -I$(LIBAOM_PATH)
.PRECIOUS: %.asm.s .PRECIOUS: %.asm.s
$(ASM_CNV_PATH)/libvpx/%.asm.s: $(LIBVPX_PATH)/%.asm $(ASM_CNV_PATH)/libaom/%.asm.s: $(LIBAOM_PATH)/%.asm
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@$(CONFIG_DIR)$(ASM_CONVERSION) <$< > $@ @$(CONFIG_DIR)$(ASM_CONVERSION) <$< > $@
...@@ -108,18 +108,18 @@ LOCAL_SRC_FILES += vpx_config.c ...@@ -108,18 +108,18 @@ LOCAL_SRC_FILES += vpx_config.c
CODEC_SRCS_UNIQUE = $(sort $(CODEC_SRCS)) CODEC_SRCS_UNIQUE = $(sort $(CODEC_SRCS))
# Pull out C files. vpx_config.c is in the immediate directory and # Pull out C files. vpx_config.c is in the immediate directory and
# so it does not need libvpx/ prefixed like the rest of the source files. # so it does not need libaom/ prefixed like the rest of the source files.
# The neon files with intrinsics need to have .neon appended so the proper # The neon files with intrinsics need to have .neon appended so the proper
# flags are applied. # flags are applied.
CODEC_SRCS_C = $(filter %.c, $(CODEC_SRCS_UNIQUE)) CODEC_SRCS_C = $(filter %.c, $(CODEC_SRCS_UNIQUE))
LOCAL_NEON_SRCS_C = $(filter %_neon.c, $(CODEC_SRCS_C)) LOCAL_NEON_SRCS_C = $(filter %_neon.c, $(CODEC_SRCS_C))
LOCAL_CODEC_SRCS_C = $(filter-out vpx_config.c %_neon.c, $(CODEC_SRCS_C)) LOCAL_CODEC_SRCS_C = $(filter-out vpx_config.c %_neon.c, $(CODEC_SRCS_C))
LOCAL_SRC_FILES += $(foreach file, $(LOCAL_CODEC_SRCS_C), libvpx/$(file)) LOCAL_SRC_FILES += $(foreach file, $(LOCAL_CODEC_SRCS_C), libaom/$(file))
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_SRC_FILES += $(foreach file, $(LOCAL_NEON_SRCS_C), libvpx/$(file).neon) LOCAL_SRC_FILES += $(foreach file, $(LOCAL_NEON_SRCS_C), libaom/$(file).neon)
else # If there are neon sources then we are building for arm64 and do not need to specify .neon else # If there are neon sources then we are building for arm64 and do not need to specify .neon
LOCAL_SRC_FILES += $(foreach file, $(LOCAL_NEON_SRCS_C), libvpx/$(file)) LOCAL_SRC_FILES += $(foreach file, $(LOCAL_NEON_SRCS_C), libaom/$(file))
endif endif
# Pull out assembly files, splitting NEON from the rest. This is # Pull out assembly files, splitting NEON from the rest. This is
...@@ -129,7 +129,7 @@ endif ...@@ -129,7 +129,7 @@ endif
# x86: # x86:
CODEC_SRCS_ASM_X86 = $(filter %.asm, $(CODEC_SRCS_UNIQUE)) CODEC_SRCS_ASM_X86 = $(filter %.asm, $(CODEC_SRCS_UNIQUE))
LOCAL_SRC_FILES += $(foreach file, $(CODEC_SRCS_ASM_X86), libvpx/$(file)) LOCAL_SRC_FILES += $(foreach file, $(CODEC_SRCS_ASM_X86), libaom/$(file))
# arm: # arm:
CODEC_SRCS_ASM_ARM_ALL = $(filter %.asm.s, $(CODEC_SRCS_UNIQUE)) CODEC_SRCS_ASM_ARM_ALL = $(filter %.asm.s, $(CODEC_SRCS_UNIQUE))
...@@ -137,7 +137,7 @@ CODEC_SRCS_ASM_ARM = $(foreach v, \ ...@@ -137,7 +137,7 @@ CODEC_SRCS_ASM_ARM = $(foreach v, \
$(CODEC_SRCS_ASM_ARM_ALL), \ $(CODEC_SRCS_ASM_ARM_ALL), \
$(if $(findstring neon,$(v)),,$(v))) $(if $(findstring neon,$(v)),,$(v)))
CODEC_SRCS_ASM_ADS2GAS = $(patsubst %.s, \ CODEC_SRCS_ASM_ADS2GAS = $(patsubst %.s, \
$(ASM_CNV_PATH_LOCAL)/libvpx/%.s, \ $(ASM_CNV_PATH_LOCAL)/libaom/%.s, \
$(CODEC_SRCS_ASM_ARM)) $(CODEC_SRCS_ASM_ARM))
LOCAL_SRC_FILES += $(CODEC_SRCS_ASM_ADS2GAS) LOCAL_SRC_FILES += $(CODEC_SRCS_ASM_ADS2GAS)
...@@ -146,7 +146,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ...@@ -146,7 +146,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
$(CODEC_SRCS_ASM_ARM_ALL),\ $(CODEC_SRCS_ASM_ARM_ALL),\
$(if $(findstring neon,$(v)),$(v),)) $(if $(findstring neon,$(v)),$(v),))
CODEC_SRCS_ASM_NEON_ADS2GAS = $(patsubst %.s, \ CODEC_SRCS_ASM_NEON_ADS2GAS = $(patsubst %.s, \
$(ASM_CNV_PATH_LOCAL)/libvpx/%.s, \ $(ASM_CNV_PATH_LOCAL)/libaom/%.s, \
$(CODEC_SRCS_ASM_NEON)) $(CODEC_SRCS_ASM_NEON))
LOCAL_SRC_FILES += $(patsubst %.s, \ LOCAL_SRC_FILES += $(patsubst %.s, \
%.s.neon, \ %.s.neon, \
...@@ -155,10 +155,10 @@ endif ...@@ -155,10 +155,10 @@ endif
LOCAL_CFLAGS += \ LOCAL_CFLAGS += \
-DHAVE_CONFIG_H=vpx_config.h \ -DHAVE_CONFIG_H=vpx_config.h \
-I$(LIBVPX_PATH) \ -I$(LIBAOM_PATH) \
-I$(ASM_CNV_PATH) -I$(ASM_CNV_PATH)
LOCAL_MODULE := libvpx LOCAL_MODULE := libaom
ifeq ($(CONFIG_RUNTIME_CPU_DETECT),yes) ifeq ($(CONFIG_RUNTIME_CPU_DETECT),yes)
LOCAL_STATIC_LIBRARIES := cpufeatures LOCAL_STATIC_LIBRARIES := cpufeatures
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
## configure.sh ## configure.sh
## ##
## This script is sourced by the main configure script and contains ## This script is sourced by the main configure script and contains
## utility functions and other common bits that aren't strictly libvpx ## utility functions and other common bits that aren't strictly libaom
## related. ## related.
## ##
## This build system is based in part on the FFmpeg configure script. ## This build system is based in part on the FFmpeg configure script.
......
...@@ -299,7 +299,7 @@ generate_vcxproj() { ...@@ -299,7 +299,7 @@ generate_vcxproj() {
tag_content AppContainerApplication true tag_content AppContainerApplication true
# The application type can be one of "Windows Store", # The application type can be one of "Windows Store",
# "Windows Phone" or "Windows Phone Silverlight". The # "Windows Phone" or "Windows Phone Silverlight". The
# actual value doesn't matter from the libvpx point of view, # actual value doesn't matter from the libaom point of view,
# since a static library built for one works on the others. # since a static library built for one works on the others.
# The PlatformToolset field needs to be set in sync with this; # The PlatformToolset field needs to be set in sync with this;
# for Windows Store and Windows Phone Silverlight it should be # for Windows Store and Windows Phone Silverlight it should be
......
...@@ -26,7 +26,7 @@ DIST_DIR="_dist" ...@@ -26,7 +26,7 @@ DIST_DIR="_dist"
FRAMEWORK_DIR="VPX.framework" FRAMEWORK_DIR="VPX.framework"
HEADER_DIR="${FRAMEWORK_DIR}/Headers/vpx" HEADER_DIR="${FRAMEWORK_DIR}/Headers/vpx"
SCRIPT_DIR=$(dirname "$0") SCRIPT_DIR=$(dirname "$0")
LIBVPX_SOURCE_DIR=$(cd ${SCRIPT_DIR}/../..; pwd) LIBAOM_SOURCE_DIR=$(cd ${SCRIPT_DIR}/../..; pwd)
LIPO=$(xcrun -sdk iphoneos${SDK} -find lipo) LIPO=$(xcrun -sdk iphoneos${SDK} -find lipo)
ORIG_PWD="$(pwd)" ORIG_PWD="$(pwd)"
ARM_TARGETS="arm64-darwin-gcc ARM_TARGETS="arm64-darwin-gcc
...@@ -56,7 +56,7 @@ build_target() { ...@@ -56,7 +56,7 @@ build_target() {
mkdir "${target}" mkdir "${target}"
cd "${target}" cd "${target}"
eval "${LIBVPX_SOURCE_DIR}/configure" --target="${target}" \ eval "${LIBAOM_SOURCE_DIR}/configure" --target="${target}" \
${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS} ${target_specific_flags} \ ${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS} ${target_specific_flags} \
${devnull} ${devnull}
export DIST_DIR export DIST_DIR
...@@ -157,12 +157,12 @@ build_framework() { ...@@ -157,12 +157,12 @@ build_framework() {
for target in ${targets}; do for target in ${targets}; do
build_target "${target}" build_target "${target}"
target_dist_dir="${BUILD_ROOT}/${target}/${DIST_DIR}" target_dist_dir="${BUILD_ROOT}/${target}/${DIST_DIR}"
lib_list="${lib_list} ${target_dist_dir}/lib/libvpx.a" lib_list="${lib_list} ${target_dist_dir}/lib/libaom.a"
done done
cd "${ORIG_PWD}" cd "${ORIG_PWD}"
# The basic libvpx API includes are all the same; just grab the most recent # The basic libaom API includes are all the same; just grab the most recent
# set. # set.
cp -p "${target_dist_dir}"/include/vpx/* "${HEADER_DIR}" cp -p "${target_dist_dir}"/include/vpx/* "${HEADER_DIR}"