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
Xiph.Org
aom-rav1e
Commits
3bd709fa
Commit
3bd709fa
authored
Jul 25, 2016
by
Yaowu Xu
Browse files
Remove vp8, vp9 folders
Change-Id: I09b8acd22d031ece52e1fee18b998349bf1cf06b
parent
b124b243
Changes
433
Hide whitespace changes
Inline
Side-by-side
configure
View file @
3bd709fa
...
...
@@ -38,8 +38,6 @@ Advanced options:
${
toggle_better_hw_compatibility
}
enable encoder to produce streams with better
hardware decoder compatibility
${
toggle_vp8
}
VP8 codec support
${
toggle_vp9
}
VP9 codec support
${
toggle_vp10
}
VP10 codec support
${
toggle_internal_stats
}
output of encoder internal stats for debug, if supported (encoders)
${
toggle_postproc
}
postprocessing
...
...
@@ -191,13 +189,8 @@ if [ ${doxy_major:-0} -ge 1 ]; then
fi
# disable codecs when their source directory does not exist
[
-d
"
${
source_path
}
/vp8"
]
||
disable_codec vp8
[
-d
"
${
source_path
}
/vp9"
]
||
disable_codec vp9
[
-d
"
${
source_path
}
/vp10"
]
||
disable_codec vp10
# disable vp10 codec by default
disable_codec vp10
# install everything except the sources, by default. sources will have
# to be enabled when doing dist builds, since that's no longer a common
# case.
...
...
@@ -214,16 +207,10 @@ enable_feature os_support
enable_feature temporal_denoising
CODECS
=
"
vp8_encoder
vp8_decoder
vp9_encoder
vp9_decoder
vp10_encoder
vp10_decoder
"
CODEC_FAMILIES
=
"
vp8
vp9
vp10
"
...
...
examples.mk
View file @
3bd709fa
...
...
@@ -248,10 +248,12 @@ endif
ifeq
($(CONFIG_OS_SUPPORT), yes)
CODEC_EXTRA_LIBS-$(CONFIG_VP8)
+=
m
CODEC_EXTRA_LIBS-$(CONFIG_VP9)
+=
m
CODEC_EXTRA_LIBS-$(CONFIG_VP10)
+=
m
else
ifeq
($(CONFIG_GCC), yes)
CODEC_EXTRA_LIBS-$(CONFIG_VP8)
+=
m
CODEC_EXTRA_LIBS-$(CONFIG_VP9)
+=
m
CODEC_EXTRA_LIBS-$(CONFIG_VP10)
+=
m
endif
endif
#
...
...
libs.mk
View file @
3bd709fa
...
...
@@ -53,62 +53,6 @@ CODEC_SRCS-yes += $(addprefix vpx_dsp/,$(call enabled,DSP_SRCS))
include
$(SRC_PATH_BARE)/vpx_util/vpx_util.mk
CODEC_SRCS-yes
+=
$(
addprefix
vpx_util/,
$(
call
enabled,UTIL_SRCS
))
ifeq
($(CONFIG_VP8),yes)
VP8_PREFIX
=
vp8/
include
$(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk
endif
ifeq
($(CONFIG_VP8_ENCODER),yes)
include
$(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx.mk
CODEC_SRCS-yes
+=
$(
addprefix
$(VP8_PREFIX)
,
$(
call
enabled,VP8_CX_SRCS
))
CODEC_EXPORTS-yes
+=
$(
addprefix
$(VP8_PREFIX)
,
$(VP8_CX_EXPORTS)
)
INSTALL-LIBS-yes
+=
include/vpx/vp8.h include/vpx/vp8cx.h
INSTALL_MAPS
+=
include/vpx/%
$(SRC_PATH_BARE)
/
$(VP8_PREFIX)
/%
CODEC_DOC_SECTIONS
+=
vp8 vp8_encoder
endif
ifeq
($(CONFIG_VP8_DECODER),yes)
include
$(SRC_PATH_BARE)/$(VP8_PREFIX)vp8dx.mk
CODEC_SRCS-yes
+=
$(
addprefix
$(VP8_PREFIX)
,
$(
call
enabled,VP8_DX_SRCS
))
CODEC_EXPORTS-yes
+=
$(
addprefix
$(VP8_PREFIX)
,
$(VP8_DX_EXPORTS)
)
INSTALL-LIBS-yes
+=
include/vpx/vp8.h include/vpx/vp8dx.h
INSTALL_MAPS
+=
include/vpx/%
$(SRC_PATH_BARE)
/
$(VP8_PREFIX)
/%
CODEC_DOC_SECTIONS
+=
vp8 vp8_decoder
endif
ifeq
($(CONFIG_VP9),yes)
VP9_PREFIX
=
vp9/
include
$(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk
endif
ifeq
($(CONFIG_VP9_ENCODER),yes)
VP9_PREFIX
=
vp9/
include
$(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk
CODEC_SRCS-yes
+=
$(
addprefix
$(VP9_PREFIX)
,
$(
call
enabled,VP9_CX_SRCS
))
CODEC_EXPORTS-yes
+=
$(
addprefix
$(VP9_PREFIX)
,
$(VP9_CX_EXPORTS)
)
CODEC_SRCS-yes
+=
$(VP9_PREFIX)
vp9cx.mk vpx/vp8.h vpx/vp8cx.h
INSTALL-LIBS-yes
+=
include/vpx/vp8.h include/vpx/vp8cx.h
INSTALL-LIBS-$(CONFIG_SPATIAL_SVC)
+=
include/vpx/svc_context.h
INSTALL_MAPS
+=
include/vpx/%
$(SRC_PATH_BARE)
/
$(VP9_PREFIX)
/%
CODEC_DOC_SRCS
+=
vpx/vp8.h vpx/vp8cx.h
CODEC_DOC_SECTIONS
+=
vp9 vp9_encoder
endif
ifeq
($(CONFIG_VP9_DECODER),yes)
VP9_PREFIX
=
vp9/
include
$(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk
CODEC_SRCS-yes
+=
$(
addprefix
$(VP9_PREFIX)
,
$(
call
enabled,VP9_DX_SRCS
))
CODEC_EXPORTS-yes
+=
$(
addprefix
$(VP9_PREFIX)
,
$(VP9_DX_EXPORTS)
)
CODEC_SRCS-yes
+=
$(VP9_PREFIX)
vp9dx.mk vpx/vp8.h vpx/vp8dx.h
INSTALL-LIBS-yes
+=
include/vpx/vp8.h include/vpx/vp8dx.h
INSTALL_MAPS
+=
include/vpx/%
$(SRC_PATH_BARE)
/
$(VP9_PREFIX)
/%
CODEC_DOC_SRCS
+=
vpx/vp8.h vpx/vp8dx.h
CODEC_DOC_SECTIONS
+=
vp9 vp9_decoder
endif
VP9_PREFIX
=
vp9/
$(BUILD_PFX)$(VP9_PREFIX)%.c.o
:
CFLAGS += -Wextra
# VP10 make file
ifeq
($(CONFIG_VP10),yes)
VP10_PREFIX
=
vp10/
...
...
test/blockiness_test.cc
View file @
3bd709fa
...
...
@@ -15,9 +15,6 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vpx_config.h"
#if CONFIG_VP9_ENCODER
#include
"./vp9_rtcd.h"
#endif
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
...
...
test/consistency_test.cc
View file @
3bd709fa
...
...
@@ -15,9 +15,6 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vpx_config.h"
#if CONFIG_VP9_ENCODER
#include
"./vp9_rtcd.h"
#endif
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
...
...
@@ -132,78 +129,10 @@ class ConsistencyTestBase : public ::testing::Test {
ACMRandom
rnd_
;
};
#if CONFIG_VP9_ENCODER
typedef
std
::
tr1
::
tuple
<
int
,
int
>
ConsistencyParam
;
class
ConsistencyVP9Test
:
public
ConsistencyTestBase
,
public
::
testing
::
WithParamInterface
<
ConsistencyParam
>
{
public:
ConsistencyVP9Test
()
:
ConsistencyTestBase
(
GET_PARAM
(
0
),
GET_PARAM
(
1
))
{}
protected:
double
CheckConsistency
(
int
frame
)
{
EXPECT_LT
(
frame
,
2
)
<<
"Frame to check has to be less than 2."
;
return
vpx_get_ssim_metrics
(
source_data_
[
frame
],
source_stride_
,
reference_data_
[
frame
],
reference_stride_
,
width_
,
height_
,
ssim_array_
,
&
metrics_
,
1
);
}
};
#endif // CONFIG_VP9_ENCODER
uint8_t
*
ConsistencyTestBase
::
source_data_
[
2
]
=
{
NULL
,
NULL
};
uint8_t
*
ConsistencyTestBase
::
reference_data_
[
2
]
=
{
NULL
,
NULL
};
Ssimv
*
ConsistencyTestBase
::
ssim_array_
=
NULL
;
#if CONFIG_VP9_ENCODER
TEST_P
(
ConsistencyVP9Test
,
ConsistencyIsZero
)
{
FillRandom
(
source_data_
[
0
],
source_stride_
);
Copy
(
source_data_
[
1
],
source_data_
[
0
]);
Copy
(
reference_data_
[
0
],
source_data_
[
0
]);
Blur
(
reference_data_
[
0
],
reference_stride_
,
3
);
Copy
(
reference_data_
[
1
],
source_data_
[
0
]);
Blur
(
reference_data_
[
1
],
reference_stride_
,
3
);
double
inconsistency
=
CheckConsistency
(
1
);
inconsistency
=
CheckConsistency
(
0
);
EXPECT_EQ
(
inconsistency
,
0.0
)
<<
"Should have 0 inconsistency if they are exactly the same."
;
// If sources are not consistent reference frames inconsistency should
// be less than if the source is consistent.
FillRandom
(
source_data_
[
0
],
source_stride_
);
FillRandom
(
source_data_
[
1
],
source_stride_
);
FillRandom
(
reference_data_
[
0
],
reference_stride_
);
FillRandom
(
reference_data_
[
1
],
reference_stride_
);
CheckConsistency
(
0
);
inconsistency
=
CheckConsistency
(
1
);
Copy
(
source_data_
[
1
],
source_data_
[
0
]);
CheckConsistency
(
0
);
double
inconsistency2
=
CheckConsistency
(
1
);
EXPECT_LT
(
inconsistency
,
inconsistency2
)
<<
"Should have less inconsistency if source itself is inconsistent."
;
// Less of a blur should be less inconsistent than more blur coming off a
// a frame with no blur.
ClearSsim
();
FillRandom
(
source_data_
[
0
],
source_stride_
);
Copy
(
source_data_
[
1
],
source_data_
[
0
]);
Copy
(
reference_data_
[
0
],
source_data_
[
0
]);
Copy
(
reference_data_
[
1
],
source_data_
[
0
]);
Blur
(
reference_data_
[
1
],
reference_stride_
,
4
);
CheckConsistency
(
0
);
inconsistency
=
CheckConsistency
(
1
);
ClearSsim
();
Copy
(
reference_data_
[
1
],
source_data_
[
0
]);
Blur
(
reference_data_
[
1
],
reference_stride_
,
8
);
CheckConsistency
(
0
);
inconsistency2
=
CheckConsistency
(
1
);
EXPECT_LT
(
inconsistency
,
inconsistency2
)
<<
"Stronger Blur should produce more inconsistency."
;
}
#endif // CONFIG_VP9_ENCODER
using
std
::
tr1
::
make_tuple
;
...
...
@@ -211,14 +140,4 @@ using std::tr1::make_tuple;
//------------------------------------------------------------------------------
// C functions
#if CONFIG_VP9_ENCODER
const
ConsistencyParam
c_vp9_tests
[]
=
{
make_tuple
(
320
,
240
),
make_tuple
(
318
,
242
),
make_tuple
(
318
,
238
),
};
INSTANTIATE_TEST_CASE_P
(
C
,
ConsistencyVP9Test
,
::
testing
::
ValuesIn
(
c_vp9_tests
));
#endif
}
// namespace
test/convolve_test.cc
View file @
3bd709fa
...
...
@@ -13,14 +13,11 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vpx_config.h"
#include
"./vp9_rtcd.h"
#include
"./vpx_dsp_rtcd.h"
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
#include
"test/register_state_check.h"
#include
"test/util.h"
#include
"vp9/common/vp9_common.h"
#include
"vp9/common/vp9_filter.h"
#include
"vpx_dsp/vpx_dsp_common.h"
#include
"vpx_dsp/vpx_filter.h"
#include
"vpx_mem/vpx_mem.h"
...
...
test/dct16x16_test.cc
View file @
3bd709fa
...
...
@@ -14,14 +14,11 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vp9_rtcd.h"
#include
"./vpx_dsp_rtcd.h"
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
#include
"test/register_state_check.h"
#include
"test/util.h"
#include
"vp9/common/vp9_entropy.h"
#include
"vp9/common/vp9_scan.h"
#include
"vpx/vpx_codec.h"
#include
"vpx/vpx_integer.h"
#include
"vpx_ports/mem.h"
...
...
test/dct32x32_test.cc
View file @
3bd709fa
...
...
@@ -14,14 +14,12 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vp9_rtcd.h"
#include
"./vpx_config.h"
#include
"./vpx_dsp_rtcd.h"
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
#include
"test/register_state_check.h"
#include
"test/util.h"
#include
"vp9/common/vp9_entropy.h"
#include
"vpx/vpx_codec.h"
#include
"vpx/vpx_integer.h"
#include
"vpx_ports/mem.h"
...
...
test/encode_api_test.cc
View file @
3bd709fa
...
...
@@ -20,12 +20,6 @@ namespace {
TEST
(
EncodeAPI
,
InvalidParams
)
{
static
const
vpx_codec_iface_t
*
kCodecs
[]
=
{
#if CONFIG_VP8_ENCODER
&
vpx_codec_vp8_cx_algo
,
#endif
#if CONFIG_VP9_ENCODER
&
vpx_codec_vp9_cx_algo
,
#endif
#if CONFIG_VP10_ENCODER
&
vpx_codec_vp10_cx_algo
,
#endif
...
...
test/fdct4x4_test.cc
View file @
3bd709fa
...
...
@@ -14,7 +14,6 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vp9_rtcd.h"
#include
"./vpx_dsp_rtcd.h"
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
...
...
test/fdct8x8_test.cc
View file @
3bd709fa
...
...
@@ -14,14 +14,11 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vp9_rtcd.h"
#include
"./vpx_dsp_rtcd.h"
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
#include
"test/register_state_check.h"
#include
"test/util.h"
#include
"vp9/common/vp9_entropy.h"
#include
"vp9/common/vp9_scan.h"
#include
"vpx/vpx_codec.h"
#include
"vpx/vpx_integer.h"
#include
"vpx_ports/mem.h"
...
...
test/idct_test.cc
View file @
3bd709fa
...
...
@@ -9,7 +9,6 @@
*/
#include
"./vpx_config.h"
#include
"./vp8_rtcd.h"
#include
"third_party/googletest/src/include/gtest/gtest.h"
...
...
test/partial_idct_test.cc
View file @
3bd709fa
...
...
@@ -14,14 +14,11 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vp9_rtcd.h"
#include
"./vpx_dsp_rtcd.h"
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
#include
"test/register_state_check.h"
#include
"test/util.h"
#include
"vp9/common/vp9_blockd.h"
#include
"vp9/common/vp9_scan.h"
#include
"vpx/vpx_integer.h"
using
libvpx_test
::
ACMRandom
;
...
...
test/quantize_test.cc
View file @
3bd709fa
...
...
@@ -13,7 +13,6 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vpx_config.h"
#include
"./vp8_rtcd.h"
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
#include
"test/register_state_check.h"
...
...
test/sixtap_predict_test.cc
View file @
3bd709fa
...
...
@@ -15,7 +15,6 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vpx_config.h"
#include
"./vp8_rtcd.h"
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
#include
"test/register_state_check.h"
...
...
test/test.mk
View file @
3bd709fa
...
...
@@ -10,6 +10,7 @@ LIBVPX_TEST_SRCS-yes += test_vectors.h
LIBVPX_TEST_SRCS-yes
+=
util.h
LIBVPX_TEST_SRCS-yes
+=
video_source.h
LIBVPX_TEST_SRCS-yes
+=
transform_test_base.h
LIBVPX_TEST_SRCS-yes
+=
function_equivalence_test.h
##
## BLACK BOX TESTS
...
...
@@ -142,7 +143,7 @@ LIBVPX_TEST_SRCS-yes += vp9_boolcoder_test.cc
LIBVPX_TEST_SRCS-yes
+=
vp9_encoder_parms_get_to_decoder.cc
endif
LIBVPX_TEST_SRCS-yes
+=
convolve_test.cc
#
LIBVPX_TEST_SRCS-yes += convolve_test.cc
LIBVPX_TEST_SRCS-yes
+=
lpf_8_test.cc
LIBVPX_TEST_SRCS-yes
+=
vp9_intrapred_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP9_DECODER)
+=
vp9_decrypt_test.cc
...
...
@@ -173,7 +174,7 @@ endif # VP9
## VP10
ifeq
($(CONFIG_VP10),yes)
LIBVPX_TEST_SRCS-
yes
+=
vp10_inv_txfm_test.cc
LIBVPX_TEST_SRCS-
$(CONFIG_VP10_ENCODER)
+=
vp10_inv_txfm_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER)
+=
vp10_dct_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER)
+=
vp10_fht4x4_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER)
+=
vp10_fht8x8_test.cc
...
...
test/vp10_convolve_test.cc
View file @
3bd709fa
...
...
@@ -12,7 +12,7 @@ using libvpx_test::ACMRandom;
namespace
{
void
setup_convolve
()
{
#if HAVE_SSSE3
#if HAVE_SSSE3
&& CONFIG_RUNTIME_CPU_DETECT
vp10_convolve_horiz
=
vp10_convolve_horiz_c
;
vp10_convolve_vert
=
vp10_convolve_vert_c
;
#endif
...
...
test/vp10_inv_txfm_test.cc
View file @
3bd709fa
...
...
@@ -289,31 +289,31 @@ using std::tr1::make_tuple;
INSTANTIATE_TEST_CASE_P
(
C
,
Vp10PartialIDctTest
,
::
testing
::
Values
(
make_tuple
(
&
vp
x
_fdct32x32_c
,
make_tuple
(
&
vp
10
_fdct32x32_c
,
&
vp10_idct32x32_1024_add_c
,
&
vp10_idct32x32_34_add_c
,
TX_32X32
,
34
),
make_tuple
(
&
vp
x
_fdct32x32_c
,
make_tuple
(
&
vp
10
_fdct32x32_c
,
&
vp10_idct32x32_1024_add_c
,
&
vp10_idct32x32_1_add_c
,
TX_32X32
,
1
),
make_tuple
(
&
vp
x
_fdct16x16_c
,
make_tuple
(
&
vp
10
_fdct16x16_c
,
&
vp10_idct16x16_256_add_c
,
&
vp10_idct16x16_10_add_c
,
TX_16X16
,
10
),
make_tuple
(
&
vp
x
_fdct16x16_c
,
make_tuple
(
&
vp
10
_fdct16x16_c
,
&
vp10_idct16x16_256_add_c
,
&
vp10_idct16x16_1_add_c
,
TX_16X16
,
1
),
make_tuple
(
&
vp
x
_fdct8x8_c
,
make_tuple
(
&
vp
10
_fdct8x8_c
,
&
vp10_idct8x8_64_add_c
,
&
vp10_idct8x8_12_add_c
,
TX_8X8
,
12
),
make_tuple
(
&
vp
x
_fdct8x8_c
,
make_tuple
(
&
vp
10
_fdct8x8_c
,
&
vp10_idct8x8_64_add_c
,
&
vp10_idct8x8_1_add_c
,
TX_8X8
,
1
),
make_tuple
(
&
vp
x
_fdct4x4_c
,
make_tuple
(
&
vp
10
_fdct4x4_c
,
&
vp10_idct4x4_16_add_c
,
&
vp10_idct4x4_1_add_c
,
TX_4X4
,
1
)));
...
...
test/vp8_fdct4x4_test.cc
View file @
3bd709fa
...
...
@@ -17,7 +17,6 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vp8_rtcd.h"
#include
"test/acm_random.h"
#include
"vpx/vpx_integer.h"
...
...
test/vp9_error_block_test.cc
View file @
3bd709fa
...
...
@@ -15,12 +15,10 @@
#include
"third_party/googletest/src/include/gtest/gtest.h"
#include
"./vpx_config.h"
#include
"./vp9_rtcd.h"
#include
"test/acm_random.h"
#include
"test/clear_system_state.h"
#include
"test/register_state_check.h"
#include
"test/util.h"
#include
"vp9/common/vp9_entropy.h"
#include
"vpx/vpx_codec.h"
#include
"vpx/vpx_integer.h"
...
...
Prev
1
2
3
4
5
…
22
Next
Write
Preview
Supports
Markdown
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