generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Port renaming changes from AOMedia

Browse Source 
Cherry-Picked the following commits:
0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia"
54e6676 Replace "VPx" by "AVx"
5082a36 Change "Vpx" to "Avx"
7df44f1 Replace "Vp9" w/ "Av1"
967f722 Remove kVp9CodecId
828f30c Change "Vp8" to "AOM"
030b5ff AUTHORS regenerated
2524cae Add ref-mv experimental flag
016762b Change copyright notice to AOMedia form
81e5526 Replace vp9 w/ av1
9b94565 Add missing files
fa8ca9f Change "vp9" to "av1"
ec838b7  Convert "vp8" to "aom"
80edfa0 Change "VP9" to "AV1"
d1a11fb Change "vp8" to "aom"
7b58251 Point to WebM test data
dd1a5c8 Replace "VP8" with "AOM"
ff00fc0 Change "VPX" to "AOM"
01dee0b Change "vp10" to "av1" in source code
cebe6f0 Convert "vpx" to "aom"
17b0567 rename vp10*.mk to av1_*.mk
fe5f8a8 rename files vp10_* to av1_*

Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
This commit is contained in:
Yaowu Xu
2016-08-30 14:01:10 -07:00
parent c27fc14b02
commit f883b42cab
685 changed files with 27424 additions and 28385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/active_map_refresh_test.cc
View File

@@ -17,7 +17,7 @@
namespace {
// Check if any pixel in a 16x16 macroblock varies between frames.
int CheckMb(const vpx_image_t &current, const vpx_image_t &previous, int mb_r,
int CheckMb(const aom_image_t &current, const aom_image_t &previous, int mb_r,
int mb_c) {
for (int plane = 0; plane < 3; plane++) {
int r = 16 * mb_r;
@@ -45,8 +45,8 @@ int CheckMb(const vpx_image_t &current, const vpx_image_t &previous, int mb_r,
return 0;
}
void GenerateMap(int mb_rows, int mb_cols, const vpx_image_t &current,
const vpx_image_t &previous, uint8_t *map) {
void GenerateMap(int mb_rows, int mb_cols, const aom_image_t &current,
const aom_image_t &previous, uint8_t *map) {
for (int mb_r = 0; mb_r < mb_rows; ++mb_r) {
for (int mb_c = 0; mb_c < mb_cols; ++mb_c) {
map[mb_r * mb_cols + mb_c] = CheckMb(current, previous, mb_r, mb_c);
@@ -74,13 +74,13 @@ class ActiveMapRefreshTest
::libaom_test::Y4mVideoSource *y4m_video =
static_cast<libaom_test::Y4mVideoSource *>(video);
if (video->frame() == 1) {
encoder->Control(VP8E_SET_CPUUSED, cpu_used_);
encoder->Control(VP9E_SET_AQ_MODE, kAqModeCyclicRefresh);
encoder->Control(AOME_SET_CPUUSED, cpu_used_);
encoder->Control(AV1E_SET_AQ_MODE, kAqModeCyclicRefresh);
} else if (video->frame() >= 2 && video->img()) {
vpx_image_t *current = video->img();
vpx_image_t *previous = y4m_holder_->img();
aom_image_t *current = video->img();
aom_image_t *previous = y4m_holder_->img();
ASSERT_TRUE(previous != NULL);
vpx_active_map_t map = vpx_active_map_t();
aom_active_map_t map = aom_active_map_t();
const int width = static_cast<int>(current->d_w);
const int height = static_cast<int>(current->d_h);
const int mb_width = (width + 15) / 16;
@@ -90,7 +90,7 @@ class ActiveMapRefreshTest
map.cols = mb_width;
map.rows = mb_height;
map.active_map = active_map;
encoder->Control(VP8E_SET_ACTIVEMAP, &map);
encoder->Control(AOME_SET_ACTIVEMAP, &map);
delete[] active_map;
}
if (video->img()) {
@@ -109,15 +109,15 @@ TEST_P(ActiveMapRefreshTest, Test) {
cfg_.rc_resize_allowed = 0;
cfg_.rc_min_quantizer = 8;
cfg_.rc_max_quantizer = 30;
cfg_.g_pass = VPX_RC_ONE_PASS;
cfg_.rc_end_usage = VPX_CBR;
cfg_.g_pass = AOM_RC_ONE_PASS;
cfg_.rc_end_usage = AOM_CBR;
cfg_.kf_max_dist = 90000;
#if CONFIG_VP10
const int nframes = codec_ == &libaom_test::kVP10 ? 10 : 30;
#if CONFIG_AV1
const int nframes = codec_ == &libaom_test::kAV1 ? 10 : 30;
#else
const int nframes = 30;
#endif // CONFIG_VP10
#endif // CONFIG_AV1
::libaom_test::Y4mVideoSource video("desktop_credits.y4m", 0, nframes);
::libaom_test::Y4mVideoSource video_holder("desktop_credits.y4m", 0, nframes);
video_holder.Begin();
@@ -126,9 +126,9 @@ TEST_P(ActiveMapRefreshTest, Test) {
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
}
#if CONFIG_VP10
VP10_INSTANTIATE_TEST_CASE(ActiveMapRefreshTest,
::testing::Values(::libaom_test::kRealTime),
::testing::Range(5, 6));
#endif // CONFIG_VP10
#if CONFIG_AV1
AV1_INSTANTIATE_TEST_CASE(ActiveMapRefreshTest,
::testing::Values(::libaom_test::kRealTime),
::testing::Range(5, 6));
#endif // CONFIG_AV1
} // namespace