Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
libvpx
Commits
a9c7597a
Commit
a9c7597a
authored
Nov 08, 2012
by
John Koleszar
Browse files
support building vp8 and vp9 into a single lib
Change-Id: Ib8f8a66c9fd31e508cdc9caa662192f38433aa3d
parent
b72373de
Changes
101
Hide whitespace changes
Inline
Side-by-side
build/make/Makefile
View file @
a9c7597a
...
...
@@ -105,14 +105,14 @@ testdata::
xform_obj_prefix
:=
.objs/
$(TOOLCHAIN)
/
xform_obj_path
=
$(
if
$(1)
,
$(
addprefix
$(xform_obj_prefix)
,
$(
subst
/,_,
$(1)
))
,
$(xform_obj_prefix)
)
xform_obj_path_o_d
=
$(
call
xform_obj_path,
$(1)
.o
)
$(
call
xform_obj_path,
$(1)
.d
)
xform_obj_path_o_d
=
$(
call
xform_obj_path,
$(1)
)
.o
$(
call
xform_obj_path,
$(1)
)
.d
define
obj_rules_template
$(BUILD_PFX)$(call xform_obj_path,$(1))%.c.d
:
$(1)%.c
$(
if
$(quiet)
,@echo
" [DEP]
$$
@"
)
$(qexec)
mkdir
-p
$
$(
dir
$$
@
)
$(qexec)$(CC)
$
$(INTERNAL_CFLAGS)
$
$(CFLAGS)
-M
$$
< |
$(fmt_deps)
>
$$
@
$(BUILD_PFX)$(call xform_obj_path,$(1))%.c.o
:
$(1)%.c
$(BUILD_PFX)$(call xform_obj_path,$(1))%.c.o
:
$(1)%.c
$(BUILD_PFX)$(call xform_obj_path
,
$(1))%.c.d
$(
if
$(quiet)
,@echo
" [CC]
$$
@"
)
$(qexec)$(CC)
$
$(INTERNAL_CFLAGS)
$
$(CFLAGS)
-c
-o
$$
@
$$
<
...
...
build/make/gen_msvs_proj.sh
View file @
a9c7597a
...
...
@@ -143,7 +143,9 @@ generate_filter() {
if
[
"
${
f
##*.
}
"
==
"
$pat
"
]
;
then
unset
file_list[i]
objf
=
$(
echo
${
f
%.*
}
.obj |
sed
-e
's/^[\./]\+//g'
-e
's,/,_,g'
)
open_tag File
RelativePath
=
"./
$f
"
if
[
"
$pat
"
==
"asm"
]
&&
$asm_use_custom_step
;
then
for
plat
in
"
${
platforms
[@]
}
"
;
do
for
cfg
in
Debug Release
;
do
...
...
@@ -154,13 +156,26 @@ generate_filter() {
Name
=
"VCCustomBuildTool"
\
Description
=
"Assembling
\$
(InputFileName)"
\
CommandLine
=
"
$(
eval echo
\$
asm_
${
cfg
}
_cmdline
)
"
\
Outputs
=
"
\$
(In
putName).
obj"
\
Outputs
=
"
\$
(In
tDir)
$
obj
f
"
\
close_tag FileConfiguration
done
done
fi
if
[
"
$pat
"
==
"c"
]
||
[
"
$pat
"
==
"cc"
]
;
then
for
plat
in
"
${
platforms
[@]
}
"
;
do
for
cfg
in
Debug Release
;
do
open_tag FileConfiguration
\
Name
=
"
${
cfg
}
|
${
plat
}
"
\
tag Tool
\
Name
=
"VCCLCompilerTool"
\
ObjectFile
=
"
\$
(IntDir)
$objf
"
\
close_tag FileConfiguration
done
done
fi
close_tag File
break
...
...
build/x86-msvs/obj_int_extract.bat
View file @
a9c7597a
...
...
@@ -13,3 +13,11 @@ cl /I "./" /I "%1" /nologo /c "%1/vp9/encoder/asm_enc_offsets.c"
obj_int_extract
.exe
rvds
"asm_com_offsets.obj"
>
"vp9_asm_com_offsets.asm"
obj_int_extract
.exe
rvds
"asm_dec_offsets.obj"
>
"vp9_asm_dec_offsets.asm"
obj_int_extract
.exe
rvds
"asm_enc_offsets.obj"
>
"vp9_asm_enc_offsets.asm"
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"
obj_int_extract
.exe
rvds
"asm_com_offsets.obj"
>
"vp8_asm_com_offsets.asm"
obj_int_extract
.exe
rvds
"asm_dec_offsets.obj"
>
"vp8_asm_dec_offsets.asm"
obj_int_extract
.exe
rvds
"asm_enc_offsets.obj"
>
"vp8_asm_enc_offsets.asm"
examples.mk
View file @
a9c7597a
...
...
@@ -38,7 +38,7 @@ vpxenc.SRCS += libmkv/EbmlWriter.c
vpxenc.SRCS
+=
libmkv/EbmlWriter.h
vpxenc.GUID
=
548DEC74-7A15-4B2B-AFC3-AA102E7C25C1
vpxenc.DESCRIPTION
=
Full featured encoder
UTILS-$(CONFIG_ENCODER
S
)
+=
vp8_scalable_patterns.c
UTILS-$(CONFIG_
VP8_
ENCODER)
+=
vp8_scalable_patterns.c
vp8_scalable_patterns.GUID
=
0D6A210B-F482-4D6F-8570-4A9C01ACC88C
vp8_scalable_patterns.DESCRIPTION
=
Temporal Scalability Encoder
...
...
@@ -56,37 +56,37 @@ endif
#example_xma.GUID = A955FC4A-73F1-44F7-135E-30D84D32F022
#example_xma.DESCRIPTION = External Memory Allocation mode usage
GEN_EXAMPLES-$(CONFIG_DECODER
S
)
+=
simple_decoder.c
GEN_EXAMPLES-$(CONFIG_
VP8_
DECODER)
+=
simple_decoder.c
simple_decoder.GUID
=
D3BBF1E9-2427-450D-BBFF-B2843C1D44CC
simple_decoder.DESCRIPTION
=
Simplified decoder loop
GEN_EXAMPLES-$(CONFIG_DECODER
S
)
+=
postproc.c
GEN_EXAMPLES-$(CONFIG_
VP8_
DECODER)
+=
postproc.c
postproc.GUID
=
65E33355-F35E-4088-884D-3FD4905881D7
postproc.DESCRIPTION
=
Decoder postprocessor control
GEN_EXAMPLES-$(CONFIG_DECODER
S
)
+=
decode_to_md5.c
GEN_EXAMPLES-$(CONFIG_
VP8_
DECODER)
+=
decode_to_md5.c
decode_to_md5.SRCS
+=
md5_utils.h md5_utils.c
decode_to_md5.GUID
=
59120B9B-2735-4BFE-B022-146CA340FE42
decode_to_md5.DESCRIPTION
=
Frame by frame MD5 checksum
GEN_EXAMPLES-$(CONFIG_ENCODER
S
)
+=
simple_encoder.c
GEN_EXAMPLES-$(CONFIG_
VP8_
ENCODER)
+=
simple_encoder.c
simple_encoder.GUID
=
4607D299-8A71-4D2C-9B1D-071899B6FBFD
simple_encoder.DESCRIPTION
=
Simplified encoder loop
GEN_EXAMPLES-$(CONFIG_ENCODER
S
)
+=
twopass_encoder.c
GEN_EXAMPLES-$(CONFIG_
VP8_
ENCODER)
+=
twopass_encoder.c
twopass_encoder.GUID
=
73494FA6-4AF9-4763-8FBB-265C92402FD8
twopass_encoder.DESCRIPTION
=
Two-pass encoder loop
GEN_EXAMPLES-$(CONFIG_ENCODER
S
)
+=
force_keyframe.c
GEN_EXAMPLES-$(CONFIG_
VP8_
ENCODER)
+=
force_keyframe.c
force_keyframe.GUID
=
3C67CADF-029F-4C86-81F5-D6D4F51177F0
force_keyframe.DESCRIPTION
=
Force generation of keyframes
ifeq
($(CONFIG_DECODERS),yes)
GEN_EXAMPLES-$(CONFIG_ENCODER
S
)
+=
decode_with_drops.c
GEN_EXAMPLES-$(CONFIG_
VP8_
ENCODER)
+=
decode_with_drops.c
endif
decode_with_drops.GUID
=
CE5C53C4-8DDA-438A-86ED-0DDD3CDB8D26
decode_with_drops.DESCRIPTION
=
Drops frames
while
decoding
ifeq
($(CONFIG_DECODER
S
),yes)
ifeq
($(CONFIG_
VP8_
DECODER),yes)
GEN_EXAMPLES-$(CONFIG_ERROR_CONCEALMENT)
+=
decode_with_partial_drops.c
endif
decode_with_partial_drops.GUID
=
61C2D026-5754-46AC-916F-1343ECC5537E
decode_with_partial_drops.DESCRIPTION
=
Drops parts of frames
while
decoding
GEN_EXAMPLES-$(CONFIG_ENCODER
S
)
+=
error_resilient.c
GEN_EXAMPLES-$(CONFIG_
VP8_
ENCODER)
+=
error_resilient.c
error_resilient.GUID
=
DF5837B9-4145-4F92-A031-44E4F832E00C
error_resilient.DESCRIPTION
=
Error Resiliency Feature
...
...
libs.mk
View file @
a9c7597a
...
...
@@ -44,6 +44,19 @@ endef
endif
# rvct
endif
# !gcc
#
# Rule to generate runtime cpu detection files
#
define
rtcd_h_template
$$(BUILD_PFX)$(1).h
:
$$(SRC_PATH_BARE)/$(2)
@
echo
" [CREATE]
$$
@"
$
$(qexec)
$
$(SRC_PATH_BARE)
/build/make/rtcd.sh
--arch
=
$
$(TGT_ISA)
\
--sym
=
$(1)
\
--config
=
$
$(target)
$
$(
if
$
$(FAT_ARCHS)
,,-
$
$(TOOLCHAIN)
)
.mk
\
$
$(RTCD_OPTIONS)
$$
^
>
$$
@
CLEAN-OBJS
+=
$
$(BUILD_PFX)$(1)
.h
RTCD
+=
$
$(BUILD_PFX)$(1)
.h
endef
CODEC_SRCS-yes
+=
CHANGELOG
CODEC_SRCS-yes
+=
libs.mk
...
...
@@ -190,7 +203,8 @@ INSTALL-LIBS-$(CONFIG_STATIC) += $(LIBSUBDIR)/libvpx.a
INSTALL-LIBS-$(CONFIG_DEBUG_LIBS)
+=
$(LIBSUBDIR)
/libvpx_g.a
endif
CODEC_SRCS
=
$(
filter-out
%_test.cc,
$(
call
enabled,CODEC_SRCS
))
CODEC_SRCS
=
$(
filter-out
%_offsets.c,
\
$(
filter-out
%_test.cc,
$(
call
enabled,CODEC_SRCS
)))
INSTALL-SRCS-$(CONFIG_CODEC_SRCS)
+=
$(CODEC_SRCS)
INSTALL-SRCS-$(CONFIG_CODEC_SRCS)
+=
$(
call
enabled,CODEC_EXPORTS
)
...
...
@@ -245,7 +259,7 @@ vpx.vcproj: $(CODEC_SRCS) vpx.def
PROJECTS-$(BUILD_LIBVPX)
+=
vpx.vcproj
vpx.vcproj
:
vpx_config.asm
vpx.vcproj
:
vpx_rtcd.h
vpx.vcproj
:
$(RTCD)
endif
else
...
...
@@ -362,18 +376,6 @@ $(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm
$(shell
$(SRC_PATH_BARE)/build/make/version.sh
"$(SRC_PATH_BARE)"
$(BUILD_PFX)vpx_version.h)
CLEAN-OBJS
+=
$(BUILD_PFX)
vpx_version.h
#
# Rule to generate runtime cpu detection files
#
$(BUILD_PFX)vpx_rtcd.h
:
$(SRC_PATH_BARE)/$(sort $(filter %rtcd_defs.sh
,
$(CODEC_SRCS)))
@
echo
" [CREATE]
$@
"
$(qexec)$(SRC_PATH_BARE)
/build/make/rtcd.sh
--arch
=
$(TGT_ISA)
\
--sym
=
vpx_rtcd
\
--config
=
$(target)
$(
if
$(FAT_ARCHS)
,,-
$(TOOLCHAIN)
)
.mk
\
$(RTCD_OPTIONS)
$^
>
$@
CLEAN-OBJS
+=
$(BUILD_PFX)
vpx_rtcd.h
CODEC_DOC_SRCS
+=
vpx/vpx_codec.h
\
vpx/vpx_decoder.h
\
vpx/vpx_encoder.h
\
...
...
@@ -501,8 +503,8 @@ libs.doxy: $(CODEC_DOC_SRCS)
@
echo
"INCLUDE_PATH += ."
>>
$@
;
@
echo
"ENABLED_SECTIONS +=
$(
sort
$(CODEC_DOC_SECTIONS)
)
"
>>
$@
## Generate
vpx_
rtcd.h for all objects
$(OBJS-yes
:
.o=.d): $(
BUILD_PFX)vpx_rtcd.h
## Generate rtcd.h for all objects
$(OBJS-yes
:
.o=.d): $(
RTCD)
## Update the global src list
SRCS
+=
$(CODEC_SRCS)
$(LIBVPX_TEST_SRCS)
$(GTEST_SRCS)
test/dct16x16_test.cc
View file @
a9c7597a
...
...
@@ -17,7 +17,7 @@
extern
"C"
{
#include "vp9/common/entropy.h"
#include "vp9/common/idct.h"
#include "vp
x
_rtcd.h"
#include "vp
9
_rtcd.h"
}
#include "acm_random.h"
...
...
test/fdct4x4_test.cc
View file @
a9c7597a
...
...
@@ -16,7 +16,7 @@
extern
"C"
{
#include "vp9/common/idct.h"
#include "vp
x
_rtcd.h"
#include "vp
9
_rtcd.h"
}
#include "acm_random.h"
...
...
test/fdct8x8_test.cc
View file @
a9c7597a
...
...
@@ -16,7 +16,7 @@
extern
"C"
{
#include "vp9/common/idct.h"
#include "vp
x
_rtcd.h"
#include "vp
9
_rtcd.h"
}
#include "acm_random.h"
...
...
test/idct8x8_test.cc
View file @
a9c7597a
...
...
@@ -16,7 +16,7 @@
extern
"C"
{
#include "vp9/common/idct.h"
#include "vp
x
_rtcd.h"
#include "vp
9
_rtcd.h"
}
#include "acm_random.h"
...
...
test/idctllm_test.cc
View file @
a9c7597a
...
...
@@ -11,7 +11,7 @@
extern
"C"
{
#include "vpx_config.h"
#include "vp
x
_rtcd.h"
#include "vp
8
_rtcd.h"
}
#include "third_party/googletest/src/include/gtest/gtest.h"
...
...
test/intrapred_test.cc
View file @
a9c7597a
...
...
@@ -14,7 +14,7 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
extern
"C"
{
#include "vpx_config.h"
#include "vp
x
_rtcd.h"
#include "vp
8
_rtcd.h"
#include "vp8/common/blockd.h"
#include "vpx_mem/vpx_mem.h"
}
...
...
test/pp_filter_test.cc
View file @
a9c7597a
...
...
@@ -10,7 +10,7 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
extern
"C"
{
#include "vpx_config.h"
#include "vp
x
_rtcd.h"
#include "vp
8
_rtcd.h"
#include "vpx/vpx_integer.h"
#include "vpx_mem/vpx_mem.h"
}
...
...
test/sad_test.cc
View file @
a9c7597a
...
...
@@ -15,7 +15,7 @@
extern
"C"
{
#include "./vpx_config.h"
#include "./vp
x
_rtcd.h"
#include "./vp
8
_rtcd.h"
#include "vp8/common/blockd.h"
#include "vpx_mem/vpx_mem.h"
}
...
...
test/sixtap_predict_test.cc
View file @
a9c7597a
...
...
@@ -16,7 +16,7 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
extern
"C"
{
#include "./vpx_config.h"
#include "./vp
x
_rtcd.h"
#include "./vp
8
_rtcd.h"
#include "vpx/vpx_integer.h"
#include "vpx_mem/vpx_mem.h"
}
...
...
test/subtract_test.cc
View file @
a9c7597a
...
...
@@ -12,7 +12,7 @@
#include "test/acm_random.h"
extern
"C"
{
#include "vpx_config.h"
#include "vp
x
_rtcd.h"
#include "vp
8
_rtcd.h"
#include "vp8/common/blockd.h"
#include "vp8/encoder/block.h"
#include "vpx_mem/vpx_mem.h"
...
...
test/variance_test.cc
View file @
a9c7597a
...
...
@@ -16,7 +16,7 @@
extern
"C"
{
#include "vp9/encoder/variance.h"
#include "vpx/vpx_integer.h"
#include "vp
x
_rtcd.h"
#include "vp
9
_rtcd.h"
}
namespace
{
...
...
test/vp8_fdct4x4_test.cc
View file @
a9c7597a
...
...
@@ -18,7 +18,7 @@
extern
"C"
{
#include "vp
x
_rtcd.h"
#include "vp
8
_rtcd.h"
}
#include "test/acm_random.h"
...
...
tools/all_builds.py
View file @
a9c7597a
...
...
@@ -5,7 +5,7 @@ import subprocess
import
sys
LONG_OPTIONS
=
[
"shard="
,
"shards="
]
BASE_COMMAND
=
"./configure
--disable-vp8 --disable-unit-tests
--enable-internal-stats --enable-experimental"
BASE_COMMAND
=
"./configure --enable-internal-stats --enable-experimental"
def
RunCommand
(
command
):
run
=
subprocess
.
Popen
(
command
,
shell
=
True
)
...
...
vp8/common/arm/armv6/idct_blk_v6.c
View file @
a9c7597a
...
...
@@ -9,7 +9,7 @@
*/
#include "vpx_config.h"
#include "vp
x
_rtcd.h"
#include "vp
8
_rtcd.h"
void
vp8_dequant_idct_add_y_block_v6
(
short
*
q
,
short
*
dq
,
...
...
vp8/common/arm/bilinearfilter_arm.c
View file @
a9c7597a
...
...
@@ -9,7 +9,7 @@
*/
#include "vpx_config.h"
#include "vp
x
_rtcd.h"
#include "vp
8
_rtcd.h"
#include <math.h>
#include "vp8/common/filter.h"
#include "bilinearfilter_arm.h"
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment