Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Yushin Cho
aom-rav1e
Commits
3d26d916
Commit
3d26d916
authored
Mar 22, 2016
by
Yaowu Xu
Browse files
libvpx -> libaom
Change-Id: I820483aefdc14f2ae946e08fe10fa01f3e845767
parent
244fb2c6
Changes
99
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
3d26d916
...
...
@@ -45,11 +45,11 @@
/ivfdec.dox
/ivfenc
/ivfenc.dox
/lib
vpx
.so*
/lib
vpx
.ver
/lib
aom
.so*
/lib
aom
.ver
/samples.dox
/test_intra_pred_speed
/test_lib
vpx
/test_lib
aom
/vp8_api1_migration.dox
/vp[89x]_rtcd.h
/vpx.pc
...
...
aom/internal/vpx_codec_internal.h
View file @
3d26d916
...
...
@@ -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.
*
* Registers functions to be called when lib
vpx
needs a frame buffer
* to decode the current frame and a function to be called when lib
vpx
does
* Registers functions to be called when lib
aom
needs a frame buffer
* to decode the current frame and a function to be called when lib
aom
does
* not internally reference the frame buffer. This set function must
* be called before the first call to decode or lib
vpx
will assume the
* be called before the first call to decode or lib
aom
will assume the
* default behavior of allocating frame buffers internally.
*
* \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,
* \param[in] cb_priv Callback's private data
*
* \retval #VPX_CODEC_OK
* External frame buffers will be used by lib
vpx
.
* External frame buffers will be used by lib
aom
.
* \retval #VPX_CODEC_INVALID_PARAM
* One or more of the callbacks were NULL.
* \retval #VPX_CODEC_ERROR
...
...
aom/src/svc_encodeframe.c
View file @
3d26d916
...
...
@@ -10,7 +10,7 @@
/**
* @file
* VP9 SVC encoding support via lib
vpx
* VP9 SVC encoding support via lib
aom
*/
#include
<assert.h>
...
...
aom/vpx_decoder.h
View file @
3d26d916
...
...
@@ -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.
*
* Registers functions to be called when lib
vpx
needs a frame buffer
* to decode the current frame and a function to be called when lib
vpx
does
* Registers functions to be called when lib
aom
needs a frame buffer
* to decode the current frame and a function to be called when lib
aom
does
* not internally reference the frame buffer. This set function must
* be called before the first call to decode or lib
vpx
will assume the
* be called before the first call to decode or lib
aom
will assume the
* default behavior of allocating frame buffers internally.
*
* \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,
* \param[in] cb_priv Callback's private data
*
* \retval #VPX_CODEC_OK
* External frame buffers will be used by lib
vpx
.
* External frame buffers will be used by lib
aom
.
* \retval #VPX_CODEC_INVALID_PARAM
* One or more of the callbacks were NULL.
* \retval #VPX_CODEC_ERROR
...
...
aom/vpx_frame_buffer.h
View file @
3d26d916
...
...
@@ -21,7 +21,7 @@ extern "C" {
#include
"./vpx_integer.h"
/*!\brief The maximum number of work buffers used by lib
vpx
.
/*!\brief The maximum number of work buffers used by lib
aom
.
* Support maximum 4 threads to decode video in parallel.
* Each thread will use one work buffer.
* TODO(hkuang): Add support to set number of worker threads dynamically.
...
...
aom_dsp/x86/sad_sse3.asm
View file @
3d26d916
...
...
@@ -32,7 +32,7 @@
movsxd
rax
,
dword
ptr
arg
(
1
)
; src_stride
movsxd
rdx
,
dword
ptr
arg
(
3
)
; ref_stride
%else
%if LIB
VPX
_YASM_WIN64
%if LIB
AOM
_YASM_WIN64
SAVE_XMM
7
,
u
%define src_ptr rcx
%define src_stride rdx
...
...
@@ -72,7 +72,7 @@
pop
rsi
pop
rbp
%else
%if LIB
VPX
_YASM_WIN64
%if LIB
AOM
_YASM_WIN64
REST
ORE_XMM
%endif
%endif
...
...
aom_ports/emms.asm
View file @
3d26d916
...
...
@@ -18,7 +18,7 @@ sym(vpx_reset_mmx_state):
ret
%if LIB
VPX
_YASM_WIN64
%if LIB
AOM
_YASM_WIN64
global
sym
(
vpx_winx64_fldcw
)
PRIVATE
sym
(
vpx_winx64_fldcw
):
sub
rsp
,
8
...
...
aom_ports/x86_abi_support.asm
View file @
3d26d916
...
...
@@ -78,15 +78,15 @@
%endif
; LIB
VPX
_YASM_WIN64
; Set LIB
VPX
_YASM_WIN64 if output is Windows 64bit so the code will work if x64
; LIB
AOM
_YASM_WIN64
; Set LIB
AOM
_YASM_WIN64 if output is Windows 64bit so the code will work if x64
; or win64 is defined on the Yasm command line.
%ifidn __OUTPUT_FORMAT__,win64
%define LIB
VPX
_YASM_WIN64 1
%define LIB
AOM
_YASM_WIN64 1
%elifidn __OUTPUT_FORMAT__,x64
%define LIB
VPX
_YASM_WIN64 1
%define LIB
AOM
_YASM_WIN64 1
%else
%define LIB
VPX
_YASM_WIN64 0
%define LIB
AOM
_YASM_WIN64 0
%endif
; sym()
...
...
@@ -101,7 +101,7 @@
%define sym(x) x
%elifidn __OUTPUT_FORMAT__,elfx32
%define sym(x) x
%elif LIB
VPX
_YASM_WIN64
%elif LIB
AOM
_YASM_WIN64
%define sym(x) x
%else
%define sym(x) _ %+ x
...
...
@@ -125,7 +125,7 @@
%define PRIVATE :hidden
%elifidn __OUTPUT_FORMAT__,elfx32
%define PRIVATE :hidden
%elif LIB
VPX
_YASM_WIN64
%elif LIB
AOM
_YASM_WIN64
%define PRIVATE
%else
%define PRIVATE :private_extern
...
...
@@ -142,7 +142,7 @@
%else
; 64 bit ABI passes arguments in registers. This is a workaround to get up
; and running quickly. Relies on SHADOW_ARGS_TO_STACK
%if LIB
VPX
_YASM_WIN64
%if LIB
AOM
_YASM_WIN64
%define arg(x) [rbp+16+8*x]
%else
%define arg(x) [rbp-8-8*x]
...
...
@@ -266,7 +266,7 @@
%endm
%define UNSHADOW_ARGS
%else
%if LIB
VPX
_YASM_WIN64
%if LIB
AOM
_YASM_WIN64
%macro SHADOW_ARGS_TO_STACK 1
; argc
%if %1 > 0
mov
arg
(
0
),
rcx
...
...
@@ -322,7 +322,7 @@
; 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 -
; but in some cases this is not done and unaligned movs must be used.
%if LIB
VPX
_YASM_WIN64
%if LIB
AOM
_YASM_WIN64
%macro SAVE_XMM 1-2 a
%if %1 < 6
%error Only xmm registers 6-15 must be preserved
...
...
aom_scale/generic/yv12config.c
View file @
3d26d916
...
...
@@ -26,7 +26,7 @@
int
vpx_yv12_de_alloc_frame_buffer
(
YV12_BUFFER_CONFIG
*
ybf
)
{
if
(
ybf
)
{
// If lib
vpx
is using frame buffer callbacks then buffer_alloc_sz must
// If lib
aom
is using frame buffer callbacks then buffer_alloc_sz must
// not be set.
if
(
ybf
->
buffer_alloc_sz
>
0
)
{
vpx_free
(
ybf
->
buffer_alloc
);
...
...
aom_scale/generic/yv12extend.c
View file @
3d26d916
...
...
@@ -215,7 +215,7 @@ void vpx_yv12_copy_frame_c(const YV12_BUFFER_CONFIG *src_ybc,
uint8_t
*
dst
=
dst_ybc
->
y_buffer
;
#if 0
/* These assertions are valid in the codec, but the lib
vpx
-tester uses
/* These assertions are valid in the codec, but the lib
aom
-tester uses
* this code slightly differently.
*/
assert(src_ybc->y_width == dst_ybc->y_width);
...
...
aom_scale/yv12config.h
View file @
3d26d916
...
...
@@ -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
// be a power of 2, from 32 to 1024. 0 sets legacy alignment. If cb is not
// NULL, then lib
vpx
is using the frame buffer callbacks to handle memory.
// If cb is not NULL, lib
vpx
will call cb with minimum size in bytes needed
// to decode the current frame. If cb is NULL, lib
vpx
will allocate memory
// NULL, then lib
aom
is using the frame buffer callbacks to handle memory.
// If cb is not NULL, lib
aom
will call cb with minimum size in bytes needed
// to decode the current frame. If cb is NULL, lib
aom
will allocate memory
// internally to decode the current frame. Returns 0 on success. Returns < 0
// on failure.
int
vpx_realloc_frame_buffer
(
YV12_BUFFER_CONFIG
*
ybf
,
int
width
,
int
height
,
...
...
av1/common/frame_buffers.h
View file @
3d26d916
...
...
@@ -35,14 +35,14 @@ int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list);
// Free any data allocated to the frame buffers.
void
vp10_free_internal_frame_buffers
(
InternalFrameBufferList
*
list
);
// Callback used by lib
vpx
to request an external frame buffer. |cb_priv|
// Callback used by lib
aom
to request an external frame buffer. |cb_priv|
// Callback private data, which points to an InternalFrameBufferList.
// |min_size| is the minimum size in bytes needed to decode the next frame.
// |fb| pointer to the frame buffer.
int
vp10_get_frame_buffer
(
void
*
cb_priv
,
size_t
min_size
,
vpx_codec_frame_buffer_t
*
fb
);
// Callback used by lib
vpx
when there are no references to the frame buffer.
// Callback used by lib
aom
when there are no references 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
);
...
...
build/make/Android.mk
View file @
3d26d916
...
...
@@ -9,11 +9,11 @@
##
#
# This file is to be used for compiling lib
vpx
for Android using the NDK.
# In an Android project place a lib
vpx
checkout in the jni directory.
# Run the configure script from the jni directory. Base lib
vpx
# This file is to be used for compiling lib
aom
for Android using the NDK.
# In an Android project place a lib
aom
checkout in the jni directory.
# Run the configure script from the jni directory. Base lib
aom
# encoder/decoder configuration will look similar to:
# ./lib
vpx
/configure --target=armv7-android-gcc --disable-examples \
# ./lib
aom
/configure --target=armv7-android-gcc --disable-examples \
# --sdk-path=/opt/android-ndk-r6b/
#
# When targeting Android, realtime-only is enabled by default. This can
...
...
@@ -24,33 +24,33 @@
# source files to compile.
#
# Place an Android.mk file in the jni directory that references the
# Android.mk file in the lib
vpx
directory:
# Android.mk file in the lib
aom
directory:
# LOCAL_PATH := $(call my-dir)
# include $(CLEAR_VARS)
# include jni/lib
vpx
/build/make/Android.mk
# include jni/lib
aom
/build/make/Android.mk
#
# There are currently two TARGET_ARCH_ABI targets for ARM.
# armeabi and armeabi-v7a. armeabi-v7a is selected by creating an
# Application.mk in the jni directory that contains:
# APP_ABI := armeabi-v7a
#
# By default lib
vpx
will detect at runtime the existance of NEON extension.
# By default lib
aom
will detect at runtime the existance of NEON extension.
# For this we import the 'cpufeatures' module from the NDK sources.
# lib
vpx
can also be configured without this runtime detection method.
# lib
aom
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 --disable-neon \
# --disable-neon-asm
# will remove any NEON dependency.
# To change to building armeabi, run ./lib
vpx
/configure again, but with
# To change to building armeabi, run ./lib
aom
/configure again, but with
# --target=armv6-android-gcc and modify the Application.mk file to
# set APP_ABI := armeabi
#
# Running ndk-build will build lib
vpx
and include it in your project.
# Running ndk-build will build lib
aom
and include it in your project.
#
CONFIG_DIR
:=
$(LOCAL_PATH)
/
LIB
VPX
_PATH
:=
$(LOCAL_PATH)
/lib
vpx
LIB
AOM
_PATH
:=
$(LOCAL_PATH)
/lib
aom
ASM_CNV_PATH_LOCAL
:=
$(TARGET_ARCH_ABI)
/ads2gas
ASM_CNV_PATH
:=
$(LOCAL_PATH)
/
$(ASM_CNV_PATH_LOCAL)
...
...
@@ -75,26 +75,26 @@ else
$(error Not a supported TARGET_ARCH_ABI
:
$(TARGET_ARCH_ABI))
endif
# Rule that is normally in Makefile created by lib
vpx
# Rule that is normally in Makefile created by lib
aom
# configure. Used to filter out source files based on configuration.
enabled
=
$(
filter-out
$
(
$(1)
-no
)
,
$
(
$(1)
-yes
))
# Override the relative path that is defined by the lib
vpx
# Override the relative path that is defined by the lib
aom
# configure process
SRC_PATH_BARE
:=
$(LIB
VPX
_PATH)
SRC_PATH_BARE
:=
$(LIB
AOM
_PATH)
# Include the list of files to be built
include
$(LIB
VPX
_PATH)/libs.mk
include
$(LIB
AOM
_PATH)/libs.mk
# Optimise the code. May want to revisit this setting in the future.
LOCAL_CFLAGS
:=
-O3
# For x86, include the source code in the search path so it will find files
# like x86inc.asm and x86_abi_support.asm
LOCAL_ASMFLAGS
:=
-I
$(LIB
VPX
_PATH)
LOCAL_ASMFLAGS
:=
-I
$(LIB
AOM
_PATH)
.PRECIOUS
:
%.asm.s
$(ASM_CNV_PATH)/lib
vpx
/%.asm.s
:
$(LIB
VPX
_PATH)/%.asm
$(ASM_CNV_PATH)/lib
aom
/%.asm.s
:
$(LIB
AOM
_PATH)/%.asm
@
mkdir
-p
$(
dir
$@
)
@
$(CONFIG_DIR)$(ASM_CONVERSION)
<
$<
>
$@
...
...
@@ -108,18 +108,18 @@ LOCAL_SRC_FILES += vpx_config.c
CODEC_SRCS_UNIQUE
=
$(
sort
$(CODEC_SRCS)
)
# Pull out C files. vpx_config.c is in the immediate directory and
# so it does not need lib
vpx
/ prefixed like the rest of the source files.
# so it does not need lib
aom
/ prefixed like the rest of the source files.
# The neon files with intrinsics need to have .neon appended so the proper
# flags are applied.
CODEC_SRCS_C
=
$(
filter
%.c,
$(CODEC_SRCS_UNIQUE)
)
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_SRC_FILES
+=
$(
foreach
file,
$(LOCAL_CODEC_SRCS_C)
, lib
vpx
/
$(file)
)
LOCAL_SRC_FILES
+=
$(
foreach
file,
$(LOCAL_CODEC_SRCS_C)
, lib
aom
/
$(file)
)
ifeq
($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_SRC_FILES
+=
$(
foreach
file,
$(LOCAL_NEON_SRCS_C)
, lib
vpx
/
$(file)
.neon
)
LOCAL_SRC_FILES
+=
$(
foreach
file,
$(LOCAL_NEON_SRCS_C)
, lib
aom
/
$(file)
.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)
, lib
vpx
/
$(file)
)
LOCAL_SRC_FILES
+=
$(
foreach
file,
$(LOCAL_NEON_SRCS_C)
, lib
aom
/
$(file)
)
endif
# Pull out assembly files, splitting NEON from the rest. This is
...
...
@@ -129,7 +129,7 @@ endif
# x86:
CODEC_SRCS_ASM_X86
=
$(
filter
%.asm,
$(CODEC_SRCS_UNIQUE)
)
LOCAL_SRC_FILES
+=
$(
foreach
file,
$(CODEC_SRCS_ASM_X86)
, lib
vpx
/
$(file)
)
LOCAL_SRC_FILES
+=
$(
foreach
file,
$(CODEC_SRCS_ASM_X86)
, lib
aom
/
$(file)
)
# arm:
CODEC_SRCS_ASM_ARM_ALL
=
$(
filter
%.asm.s,
$(CODEC_SRCS_UNIQUE)
)
...
...
@@ -137,7 +137,7 @@ CODEC_SRCS_ASM_ARM = $(foreach v, \
$(CODEC_SRCS_ASM_ARM_ALL)
,
\
$(
if
$(
findstring
neon,
$(v)
)
,,
$(v)
))
CODEC_SRCS_ASM_ADS2GAS
=
$(
patsubst
%.s,
\
$(ASM_CNV_PATH_LOCAL)
/lib
vpx
/%.s,
\
$(ASM_CNV_PATH_LOCAL)
/lib
aom
/%.s,
\
$(CODEC_SRCS_ASM_ARM)
)
LOCAL_SRC_FILES
+=
$(CODEC_SRCS_ASM_ADS2GAS)
...
...
@@ -146,7 +146,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
$(CODEC_SRCS_ASM_ARM_ALL)
,
\
$(
if
$(
findstring
neon,
$(v)
)
,
$(v)
,
))
CODEC_SRCS_ASM_NEON_ADS2GAS
=
$(
patsubst
%.s,
\
$(ASM_CNV_PATH_LOCAL)
/lib
vpx
/%.s,
\
$(ASM_CNV_PATH_LOCAL)
/lib
aom
/%.s,
\
$(CODEC_SRCS_ASM_NEON)
)
LOCAL_SRC_FILES
+=
$(
patsubst
%.s,
\
%.s.neon,
\
...
...
@@ -155,10 +155,10 @@ endif
LOCAL_CFLAGS
+=
\
-DHAVE_CONFIG_H
=
vpx_config.h
\
-I
$(LIB
VPX
_PATH)
\
-I
$(LIB
AOM
_PATH)
\
-I
$(ASM_CNV_PATH)
LOCAL_MODULE
:=
lib
vpx
LOCAL_MODULE
:=
lib
aom
ifeq
($(CONFIG_RUNTIME_CPU_DETECT),yes)
LOCAL_STATIC_LIBRARIES
:=
cpufeatures
...
...
build/make/configure.sh
View file @
3d26d916
...
...
@@ -3,7 +3,7 @@
## configure.sh
##
## This script is sourced by the main configure script and contains
## utility functions and other common bits that aren't strictly lib
vpx
## utility functions and other common bits that aren't strictly lib
aom
## related.
##
## This build system is based in part on the FFmpeg configure script.
...
...
build/make/gen_msvs_vcxproj.sh
View file @
3d26d916
...
...
@@ -299,7 +299,7 @@ generate_vcxproj() {
tag_content AppContainerApplication
true
# The application type can be one of "Windows Store",
# "Windows Phone" or "Windows Phone Silverlight". The
# actual value doesn't matter from the lib
vpx
point of view,
# actual value doesn't matter from the lib
aom
point of view,
# since a static library built for one works on the others.
# The PlatformToolset field needs to be set in sync with this;
# for Windows Store and Windows Phone Silverlight it should be
...
...
build/make/iosbuild.sh
View file @
3d26d916
...
...
@@ -26,7 +26,7 @@ DIST_DIR="_dist"
FRAMEWORK_DIR
=
"VPX.framework"
HEADER_DIR
=
"
${
FRAMEWORK_DIR
}
/Headers/vpx"
SCRIPT_DIR
=
$(
dirname
"
$0
"
)
LIB
VPX
_SOURCE_DIR
=
$(
cd
${
SCRIPT_DIR
}
/../..
;
pwd
)
LIB
AOM
_SOURCE_DIR
=
$(
cd
${
SCRIPT_DIR
}
/../..
;
pwd
)
LIPO
=
$(
xcrun
-sdk
iphoneos
${
SDK
}
-find
lipo
)
ORIG_PWD
=
"
$(
pwd
)
"
ARM_TARGETS
=
"arm64-darwin-gcc
...
...
@@ -56,7 +56,7 @@ build_target() {
mkdir
"
${
target
}
"
cd
"
${
target
}
"
eval
"
${
LIB
VPX
_SOURCE_DIR
}
/configure"
--target
=
"
${
target
}
"
\
eval
"
${
LIB
AOM
_SOURCE_DIR
}
/configure"
--target
=
"
${
target
}
"
\
${
CONFIGURE_ARGS
}
${
EXTRA_CONFIGURE_ARGS
}
${
target_specific_flags
}
\
${
devnull
}
export
DIST_DIR
...
...
@@ -157,12 +157,12 @@ build_framework() {
for
target
in
${
targets
}
;
do
build_target
"
${
target
}
"
target_dist_dir
=
"
${
BUILD_ROOT
}
/
${
target
}
/
${
DIST_DIR
}
"
lib_list
=
"
${
lib_list
}
${
target_dist_dir
}
/lib/lib
vpx
.a"
lib_list
=
"
${
lib_list
}
${
target_dist_dir
}
/lib/lib
aom
.a"
done
cd
"
${
ORIG_PWD
}
"
# The basic lib
vpx
API includes are all the same; just grab the most recent
# The basic lib
aom
API includes are all the same; just grab the most recent
# set.
cp
-p
"
${
target_dist_dir
}
"
/include/vpx/
*
"
${
HEADER_DIR
}
"
...
...
@@ -213,7 +213,7 @@ iosbuild_usage() {
cat
<<
EOF
Usage:
${
0
##*/
}
[arguments]
--help: Display this message and exit.
--extra-configure-args <args>: Extra args to pass when configuring lib
vpx
.
--extra-configure-args <args>: Extra args to pass when configuring lib
aom
.
--macosx: Uses darwin15 targets instead of iphonesimulator targets for x86
and x86_64. Allows linking to framework when builds target MacOSX
instead of iOS.
...
...
@@ -286,7 +286,7 @@ cat << EOF
EXTRA_CONFIGURE_ARGS=
${
EXTRA_CONFIGURE_ARGS
}
FRAMEWORK_DIR=
${
FRAMEWORK_DIR
}
HEADER_DIR=
${
HEADER_DIR
}
LIB
VPX
_SOURCE_DIR=
${
LIB
VPX
_SOURCE_DIR
}
LIB
AOM
_SOURCE_DIR=
${
LIB
AOM
_SOURCE_DIR
}
LIPO=
${
LIPO
}
MAKEFLAGS=
${
MAKEFLAGS
}
ORIG_PWD=
${
ORIG_PWD
}
...
...
examples/simple_decoder.c
View file @
3d26d916
...
...
@@ -32,7 +32,7 @@
//
// Initializing The Codec
// ----------------------
// The lib
vpx
decoder is initialized by the call to vpx_codec_dec_init().
// The lib
aom
decoder is initialized by the call to vpx_codec_dec_init().
// Determining the codec interface to use is handled by VpxVideoReader and the
// functions prefixed with vpx_video_reader_. Discussion of those functions is
// beyond the scope of this example, but the main gist is to open the input file
...
...
libs.mk
View file @
3d26d916
...
...
@@ -143,8 +143,8 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/v
INSTALL-LIBS-$(CONFIG_SHARED)
+=
$(
foreach
p,
$(VS_PLATFORMS)
,
$(LIBSUBDIR)
/
$(p)
/vpx.exp
)
endif
else
INSTALL-LIBS-$(CONFIG_STATIC)
+=
$(LIBSUBDIR)
/lib
vpx
.a
INSTALL-LIBS-$(CONFIG_DEBUG_LIBS)
+=
$(LIBSUBDIR)
/lib
vpx
_g.a
INSTALL-LIBS-$(CONFIG_STATIC)
+=
$(LIBSUBDIR)
/lib
aom
.a
INSTALL-LIBS-$(CONFIG_DEBUG_LIBS)
+=
$(LIBSUBDIR)
/lib
aom
_g.a
endif
CODEC_SRCS
=
$(
call
enabled,CODEC_SRCS
)
...
...
@@ -154,10 +154,10 @@ INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(call enabled,CODEC_EXPORTS)
# Generate a list of all enabled sources, in particular for exporting to gyp
# based build systems.
lib
vpx
_srcs.txt
:
lib
aom
_srcs.txt
:
@
echo
" [CREATE]
$@
"
@
echo
$(CODEC_SRCS)
| xargs
-n1
echo
|
LC_ALL
=
C
sort
-u
>
$@
CLEAN-OBJS
+=
lib
vpx
_srcs.txt
CLEAN-OBJS
+=
lib
aom
_srcs.txt
ifeq
($(CONFIG_EXTERNAL_BUILD),yes)
...
...
@@ -199,94 +199,94 @@ vpx.$(VCPROJ_SFX): $(RTCD)
endif
else
LIB
VPX
_OBJS
=
$(
call
objs,
$(CODEC_SRCS)
)
OBJS-yes
+=
$(LIB
VPX
_OBJS)
LIBS-$(if
yes,
$(CONFIG_STATIC))
+=
$(BUILD_PFX)
lib
vpx
.a
$(BUILD_PFX)
lib
vpx
_g.a
$(BUILD_PFX)lib
vpx
_g.a
:
$(LIB
VPX
_OBJS)
LIB
AOM
_OBJS
=
$(
call
objs,
$(CODEC_SRCS)
)
OBJS-yes
+=
$(LIB
AOM
_OBJS)
LIBS-$(if
yes,
$(CONFIG_STATIC))
+=
$(BUILD_PFX)
lib
aom
.a
$(BUILD_PFX)
lib
aom
_g.a
$(BUILD_PFX)lib
aom
_g.a
:
$(LIB
AOM
_OBJS)
SO_VERSION_MAJOR
:=
3
SO_VERSION_MINOR
:=
0
SO_VERSION_PATCH
:=
0
ifeq
($(filter darwin%,$(TGT_OS)),$(TGT_OS))
LIB
VPX
_SO
:=
lib
vpx
.
$(SO_VERSION_MAJOR)
.dylib
LIB
AOM
_SO
:=
lib
aom
.
$(SO_VERSION_MAJOR)
.dylib
SHARED_LIB_SUF
:=
.dylib
EXPORT_FILE
:=
lib
vpx
.syms
LIB
VPX
_SO_SYMLINKS
:=
$(
addprefix
$(LIBSUBDIR)
/,
\
lib
vpx
.dylib
)
EXPORT_FILE
:=
lib
aom
.syms
LIB
AOM
_SO_SYMLINKS
:=
$(
addprefix
$(LIBSUBDIR)
/,
\
lib
aom
.dylib
)
else
ifeq
($(filter os2%,$(TGT_OS)),$(TGT_OS))
LIB
VPX
_SO
:=
lib
vpx
$(SO_VERSION_MAJOR)
.dll
LIB
AOM
_SO
:=
lib
aom
$(SO_VERSION_MAJOR)
.dll
SHARED_LIB_SUF
:=
_dll.a
EXPORT_FILE
:=
lib
vpx
.def
LIB
VPX
_SO_SYMLINKS
:=
LIB
VPX
_SO_IMPLIB
:=
lib
vpx
_dll.a
EXPORT_FILE
:=
lib
aom
.def
LIB
AOM
_SO_SYMLINKS
:=
LIB
AOM
_SO_IMPLIB
:=
lib
aom
_dll.a
else
LIB
VPX
_SO
:=
lib
vpx
.so.
$(SO_VERSION_MAJOR)
.
$(SO_VERSION_MINOR)
.
$(SO_VERSION_PATCH)
LIB
AOM
_SO
:=
lib
aom
.so.
$(SO_VERSION_MAJOR)
.
$(SO_VERSION_MINOR)
.
$(SO_VERSION_PATCH)
SHARED_LIB_SUF
:=
.so
EXPORT_FILE
:=
lib
vpx
.ver
LIB
VPX
_SO_SYMLINKS
:=
$(
addprefix
$(LIBSUBDIR)
/,
\
lib
vpx
.so lib
vpx
.so.
$(SO_VERSION_MAJOR)
\
lib
vpx
.so.
$(SO_VERSION_MAJOR)
.
$(SO_VERSION_MINOR)
)
EXPORT_FILE
:=
lib
aom
.ver
LIB
AOM
_SO_SYMLINKS
:=
$(
addprefix
$(LIBSUBDIR)
/,
\
lib
aom
.so lib
aom
.so.
$(SO_VERSION_MAJOR)
\
lib
aom
.so.
$(SO_VERSION_MAJOR)
.
$(SO_VERSION_MINOR)
)
endif
endif
LIBS-$(CONFIG_SHARED)
+=
$(BUILD_PFX)$(LIB
VPX
_SO)
\
$(
notdir
$(LIB
VPX
_SO_SYMLINKS)
)
\
$(
if
$(LIB
VPX
_SO_IMPLIB)
,
$(BUILD_PFX)$(LIB
VPX
_SO_IMPLIB)
)
$(BUILD_PFX)$(LIB
VPX
_SO)
:
$(LIB
VPX
_OBJS) $(EXPORT_FILE)
$(BUILD_PFX)$(LIB
VPX
_SO)
:
extralibs += -lm
$(BUILD_PFX)$(LIB
VPX
_SO)
:
SONAME = lib
vpx
.so.$(SO_VERSION_MAJOR)
$(BUILD_PFX)$(LIB
VPX
_SO)
:
EXPORTS_FILE = $(EXPORT_FILE)
LIBS-$(CONFIG_SHARED)
+=
$(BUILD_PFX)$(LIB
AOM
_SO)
\
$(
notdir
$(LIB
AOM
_SO_SYMLINKS)
)
\
$(
if
$(LIB
AOM
_SO_IMPLIB)
,
$(BUILD_PFX)$(LIB
AOM
_SO_IMPLIB)
)
$(BUILD_PFX)$(LIB
AOM
_SO)
:
$(LIB
AOM
_OBJS) $(EXPORT_FILE)
$(BUILD_PFX)$(LIB
AOM
_SO)
:
extralibs += -lm
$(BUILD_PFX)$(LIB
AOM
_SO)
:
SONAME = lib
aom
.so.$(SO_VERSION_MAJOR)
$(BUILD_PFX)$(LIB
AOM
_SO)
:
EXPORTS_FILE = $(EXPORT_FILE)
lib
vpx
.ver
:
$(call enabled
,
CODEC_EXPORTS)
lib
aom
.ver
:
$(call enabled
,
CODEC_EXPORTS)
@
echo
" [CREATE]
$@
"
$(qexec)
echo
"{ global:"
>
$@
$(qexec)
for
f
in
$?
;
do
awk
'{print $$2";"}'
<
$$
f
>>
$@
;
done
$(qexec)
echo
"local: *; };"
>>
$@
CLEAN-OBJS
+=
lib
vpx
.ver
CLEAN-OBJS
+=
lib
aom
.ver
lib
vpx
.syms
:
$(call enabled
,
CODEC_EXPORTS)
lib
aom
.syms
:
$(call enabled
,
CODEC_EXPORTS)
@
echo
" [CREATE]
$@
"
$(qexec)
awk
'{print "_"$$2}'
$^
>
$@
CLEAN-OBJS
+=
lib
vpx
.syms
CLEAN-OBJS
+=
lib
aom
.syms
lib
vpx
.def
:
$(call enabled
,
CODEC_EXPORTS)
lib
aom
.def
:
$(call enabled
,
CODEC_EXPORTS)
@
echo
" [CREATE]
$@
"
$(qexec)
echo
LIBRARY
$(LIB
VPX
_SO:.dll=)
INITINSTANCE TERMINSTANCE
>
$@
$(qexec)
echo
LIBRARY
$(LIB
AOM
_SO:.dll=)
INITINSTANCE TERMINSTANCE
>
$@
$(qexec)
echo
"DATA MULTIPLE NONSHARED"
>>
$@
$(qexec)
echo
"EXPORTS"
>>
$@
$(qexec)
awk
'!/vpx_svc_*/ {print "_"$$2}'
$^
>>
$@
CLEAN-OBJS
+=
lib
vpx
.def
CLEAN-OBJS
+=
lib
aom
.def
lib
vpx
_dll.a
:
$(LIB
VPX
_SO)
lib
aom
_dll.a
:
$(LIB
AOM
_SO)
@
echo
" [IMPLIB]
$@
"
$(qexec)
emximp
-o
$@
$<
CLEAN-OBJS
+=
lib
vpx
_dll.a
CLEAN-OBJS
+=
lib
aom
_dll.a
define
lib
vpx
_symlink_template
define
lib
aom
_symlink_template
$(1)
:
$(2)
@
echo
" [LN]
$(2)
$$
@"
$(qexec)
mkdir
-p
$
$(
dir
$$
@
)
$(qexec)
ln
-sf
$(2)
$$
@
endef
$(eval
$(call
lib
vpx
_symlink_template,\
$(addprefix
$(BUILD_PFX),$(notdir
$(LIB
VPX
_SO_SYMLINKS))),\
$(BUILD_PFX)$(LIB
VPX
_SO)))
$(eval
$(call
lib
vpx
_symlink_template,\
$(addprefix
$(DIST_DIR)/,$(LIB
VPX
_SO_SYMLINKS)),\
$(LIB
VPX
_SO)))
$(eval
$(call
lib
aom
_symlink_template,\
$(addprefix
$(BUILD_PFX),$(notdir
$(LIB
AOM
_SO_SYMLINKS))),\
$(BUILD_PFX)$(LIB
AOM
_SO)))
$(eval
$(call
lib
aom
_symlink_template,\
$(addprefix
$(DIST_DIR)/,$(LIB
AOM
_SO_SYMLINKS)),\
$(LIB
AOM
_SO)))
INSTALL-LIBS-$(CONFIG_SHARED)
+=
$(LIB
VPX
_SO_SYMLINKS)
INSTALL-LIBS-$(CONFIG_SHARED)
+=
$(LIBSUBDIR)
/
$(LIB
VPX
_SO)
INSTALL-LIBS-$(CONFIG_SHARED)
+=
$(
if
$(LIB
VPX
_SO_IMPLIB)
,
$(LIBSUBDIR)
/
$(LIB
VPX
_SO_IMPLIB)
)
INSTALL-LIBS-$(CONFIG_SHARED)
+=
$(LIB
AOM
_SO_SYMLINKS)
INSTALL-LIBS-$(CONFIG_SHARED)
+=
$(LIBSUBDIR)
/
$(LIB
AOM
_SO)
INSTALL-LIBS-$(CONFIG_SHARED)
+=
$(
if
$(LIB
AOM
_SO_IMPLIB)
,
$(LIBSUBDIR)
/
$(LIB
AOM
_SO_IMPLIB)
)
LIBS-yes
+=
vpx.pc
vpx.pc
:
config.mk libs.mk
@
echo
" [CREATE]
$@
"
$(qexec)
echo
'# pkg-config file from lib
vpx
$(VERSION_STRING)
'
>
$@
$(qexec)
echo
'# pkg-config file from lib
aom
$(VERSION_STRING)
'
>
$@
$(qexec)
echo
'prefix=
$(PREFIX)
'
>>
$@
$(qexec)
echo
'exec_prefix=$
${prefix}
'
>>
$@
$(qexec)
echo
'libdir=$
${prefix}
/
$(LIBSUBDIR)
'
>>
$@
...
...
@@ -340,40 +340,40 @@ CLEAN-OBJS += $(BUILD_PFX)vpx_version.h
##
## lib
vpx
test directives
## lib
aom
test directives
##
ifeq
($(CONFIG_UNIT_TESTS),yes)
LIBAOM_TEST_DATA_PATH
?=
.
include
$(SRC_PATH_BARE)/test/test.mk
LIB
VPX
_TEST_SRCS
=
$(
addprefix
test
/,
$(
call
enabled,LIB
VPX
_TEST_SRCS
))
LIB
VPX
_TEST_BIN
=
./test_lib
vpx
$(EXE_SFX)
LIB
VPX
_TEST_DATA
=
$(
addprefix
$(LIBAOM_TEST_DATA_PATH)
/,
\
<