Port renaming changes from AOMedia
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
diff --git a/test/decode_perf_test.cc b/test/decode_perf_test.cc
index 04ca12f..0699863 100644
--- a/test/decode_perf_test.cc
+++ b/test/decode_perf_test.cc
@@ -17,9 +17,9 @@
#include "test/md5_helper.h"
#include "test/util.h"
#include "test/webm_video_source.h"
-#include "aom_ports/vpx_timer.h"
+#include "aom_ports/aom_timer.h"
#include "./ivfenc.h"
-#include "./vpx_version.h"
+#include "./aom_version.h"
using std::tr1::make_tuple;
@@ -37,26 +37,26 @@
*/
typedef std::tr1::tuple<const char *, unsigned> DecodePerfParam;
-const DecodePerfParam kVP9DecodePerfVectors[] = {
- make_tuple("vp90-2-bbb_426x240_tile_1x1_180kbps.webm", 1),
- make_tuple("vp90-2-bbb_640x360_tile_1x2_337kbps.webm", 2),
- make_tuple("vp90-2-bbb_854x480_tile_1x2_651kbps.webm", 2),
- make_tuple("vp90-2-bbb_1280x720_tile_1x4_1310kbps.webm", 4),
- make_tuple("vp90-2-bbb_1920x1080_tile_1x1_2581kbps.webm", 1),
- make_tuple("vp90-2-bbb_1920x1080_tile_1x4_2586kbps.webm", 4),
- make_tuple("vp90-2-bbb_1920x1080_tile_1x4_fpm_2304kbps.webm", 4),
- make_tuple("vp90-2-sintel_426x182_tile_1x1_171kbps.webm", 1),
- make_tuple("vp90-2-sintel_640x272_tile_1x2_318kbps.webm", 2),
- make_tuple("vp90-2-sintel_854x364_tile_1x2_621kbps.webm", 2),
- make_tuple("vp90-2-sintel_1280x546_tile_1x4_1257kbps.webm", 4),
- make_tuple("vp90-2-sintel_1920x818_tile_1x4_fpm_2279kbps.webm", 4),
- make_tuple("vp90-2-tos_426x178_tile_1x1_181kbps.webm", 1),
- make_tuple("vp90-2-tos_640x266_tile_1x2_336kbps.webm", 2),
- make_tuple("vp90-2-tos_854x356_tile_1x2_656kbps.webm", 2),
- make_tuple("vp90-2-tos_854x356_tile_1x2_fpm_546kbps.webm", 2),
- make_tuple("vp90-2-tos_1280x534_tile_1x4_1306kbps.webm", 4),
- make_tuple("vp90-2-tos_1280x534_tile_1x4_fpm_952kbps.webm", 4),
- make_tuple("vp90-2-tos_1920x800_tile_1x4_fpm_2335kbps.webm", 4),
+const DecodePerfParam kAV1DecodePerfVectors[] = {
+ make_tuple("av10-2-bbb_426x240_tile_1x1_180kbps.webm", 1),
+ make_tuple("av10-2-bbb_640x360_tile_1x2_337kbps.webm", 2),
+ make_tuple("av10-2-bbb_854x480_tile_1x2_651kbps.webm", 2),
+ make_tuple("av10-2-bbb_1280x720_tile_1x4_1310kbps.webm", 4),
+ make_tuple("av10-2-bbb_1920x1080_tile_1x1_2581kbps.webm", 1),
+ make_tuple("av10-2-bbb_1920x1080_tile_1x4_2586kbps.webm", 4),
+ make_tuple("av10-2-bbb_1920x1080_tile_1x4_fpm_2304kbps.webm", 4),
+ make_tuple("av10-2-sintel_426x182_tile_1x1_171kbps.webm", 1),
+ make_tuple("av10-2-sintel_640x272_tile_1x2_318kbps.webm", 2),
+ make_tuple("av10-2-sintel_854x364_tile_1x2_621kbps.webm", 2),
+ make_tuple("av10-2-sintel_1280x546_tile_1x4_1257kbps.webm", 4),
+ make_tuple("av10-2-sintel_1920x818_tile_1x4_fpm_2279kbps.webm", 4),
+ make_tuple("av10-2-tos_426x178_tile_1x1_181kbps.webm", 1),
+ make_tuple("av10-2-tos_640x266_tile_1x2_336kbps.webm", 2),
+ make_tuple("av10-2-tos_854x356_tile_1x2_656kbps.webm", 2),
+ make_tuple("av10-2-tos_854x356_tile_1x2_fpm_546kbps.webm", 2),
+ make_tuple("av10-2-tos_1280x534_tile_1x4_1306kbps.webm", 4),
+ make_tuple("av10-2-tos_1280x534_tile_1x4_fpm_952kbps.webm", 4),
+ make_tuple("av10-2-tos_1920x800_tile_1x4_fpm_2335kbps.webm", 4),
};
/*
@@ -79,19 +79,19 @@
libaom_test::WebMVideoSource video(video_name);
video.Init();
- vpx_codec_dec_cfg_t cfg = vpx_codec_dec_cfg_t();
+ aom_codec_dec_cfg_t cfg = aom_codec_dec_cfg_t();
cfg.threads = threads;
- libaom_test::VP9Decoder decoder(cfg, 0);
+ libaom_test::AV1Decoder decoder(cfg, 0);
- vpx_usec_timer t;
- vpx_usec_timer_start(&t);
+ aom_usec_timer t;
+ aom_usec_timer_start(&t);
for (video.Begin(); video.cxdata() != NULL; video.Next()) {
decoder.DecodeFrame(video.cxdata(), video.frame_size());
}
- vpx_usec_timer_mark(&t);
- const double elapsed_secs = double(vpx_usec_timer_elapsed(&t)) / kUsecsInSec;
+ aom_usec_timer_mark(&t);
+ const double elapsed_secs = double(aom_usec_timer_elapsed(&t)) / kUsecsInSec;
const unsigned frames = video.frame_number();
const double fps = double(frames) / elapsed_secs;
@@ -106,18 +106,18 @@
printf("}\n");
}
-INSTANTIATE_TEST_CASE_P(VP9, DecodePerfTest,
- ::testing::ValuesIn(kVP9DecodePerfVectors));
+INSTANTIATE_TEST_CASE_P(AV1, DecodePerfTest,
+ ::testing::ValuesIn(kAV1DecodePerfVectors));
-class VP9NewEncodeDecodePerfTest
+class AV1NewEncodeDecodePerfTest
: public ::libaom_test::EncoderTest,
public ::libaom_test::CodecTestWithParam<libaom_test::TestMode> {
protected:
- VP9NewEncodeDecodePerfTest()
+ AV1NewEncodeDecodePerfTest()
: EncoderTest(GET_PARAM(0)), encoding_mode_(GET_PARAM(1)), speed_(0),
outfile_(0), out_frames_(0) {}
- virtual ~VP9NewEncodeDecodePerfTest() {}
+ virtual ~AV1NewEncodeDecodePerfTest() {}
virtual void SetUp() {
InitializeConfig();
@@ -133,15 +133,15 @@
cfg_.rc_buf_initial_sz = 500;
cfg_.rc_buf_optimal_sz = 600;
cfg_.rc_resize_allowed = 0;
- cfg_.rc_end_usage = VPX_VBR;
+ cfg_.rc_end_usage = AOM_VBR;
}
virtual void PreEncodeFrameHook(::libaom_test::VideoSource *video,
::libaom_test::Encoder *encoder) {
if (video->frame() == 1) {
- encoder->Control(VP8E_SET_CPUUSED, speed_);
- encoder->Control(VP9E_SET_FRAME_PARALLEL_DECODING, 1);
- encoder->Control(VP9E_SET_TILE_COLUMNS, 2);
+ encoder->Control(AOME_SET_CPUUSED, speed_);
+ encoder->Control(AV1E_SET_FRAME_PARALLEL_DECODING, 1);
+ encoder->Control(AV1E_SET_TILE_COLUMNS, 2);
}
}
@@ -155,18 +155,18 @@
virtual void EndPassHook() {
if (outfile_ != NULL) {
if (!fseek(outfile_, 0, SEEK_SET))
- ivf_write_file_header(outfile_, &cfg_, VP9_FOURCC, out_frames_);
+ ivf_write_file_header(outfile_, &cfg_, AV1_FOURCC, out_frames_);
fclose(outfile_);
outfile_ = NULL;
}
}
- virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {
+ virtual void FramePktHook(const aom_codec_cx_pkt_t *pkt) {
++out_frames_;
// Write initial file header if first frame.
if (pkt->data.frame.pts == 0)
- ivf_write_file_header(outfile_, &cfg_, VP9_FOURCC, out_frames_);
+ ivf_write_file_header(outfile_, &cfg_, AV1_FOURCC, out_frames_);
// Write frame header and data.
ivf_write_frame_header(outfile_, out_frames_, pkt->data.frame.sz);
@@ -197,26 +197,26 @@
int frames;
};
-const EncodePerfTestVideo kVP9EncodePerfTestVectors[] = {
+const EncodePerfTestVideo kAV1EncodePerfTestVectors[] = {
EncodePerfTestVideo("niklas_1280_720_30.yuv", 1280, 720, 600, 470),
};
-TEST_P(VP9NewEncodeDecodePerfTest, PerfTest) {
+TEST_P(AV1NewEncodeDecodePerfTest, PerfTest) {
SetUp();
// TODO(JBB): Make this work by going through the set of given files.
const int i = 0;
- const vpx_rational timebase = { 33333333, 1000000000 };
+ const aom_rational timebase = { 33333333, 1000000000 };
cfg_.g_timebase = timebase;
- cfg_.rc_target_bitrate = kVP9EncodePerfTestVectors[i].bitrate;
+ cfg_.rc_target_bitrate = kAV1EncodePerfTestVectors[i].bitrate;
- init_flags_ = VPX_CODEC_USE_PSNR;
+ init_flags_ = AOM_CODEC_USE_PSNR;
- const char *video_name = kVP9EncodePerfTestVectors[i].name;
+ const char *video_name = kAV1EncodePerfTestVectors[i].name;
libaom_test::I420VideoSource video(
- video_name, kVP9EncodePerfTestVectors[i].width,
- kVP9EncodePerfTestVectors[i].height, timebase.den, timebase.num, 0,
- kVP9EncodePerfTestVectors[i].frames);
+ video_name, kAV1EncodePerfTestVectors[i].width,
+ kAV1EncodePerfTestVectors[i].height, timebase.den, timebase.num, 0,
+ kAV1EncodePerfTestVectors[i].frames);
set_speed(2);
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
@@ -226,21 +226,21 @@
libaom_test::IVFVideoSource decode_video(kNewEncodeOutputFile);
decode_video.Init();
- vpx_codec_dec_cfg_t cfg = vpx_codec_dec_cfg_t();
+ aom_codec_dec_cfg_t cfg = aom_codec_dec_cfg_t();
cfg.threads = threads;
- libaom_test::VP9Decoder decoder(cfg, 0);
+ libaom_test::AV1Decoder decoder(cfg, 0);
- vpx_usec_timer t;
- vpx_usec_timer_start(&t);
+ aom_usec_timer t;
+ aom_usec_timer_start(&t);
for (decode_video.Begin(); decode_video.cxdata() != NULL;
decode_video.Next()) {
decoder.DecodeFrame(decode_video.cxdata(), decode_video.frame_size());
}
- vpx_usec_timer_mark(&t);
+ aom_usec_timer_mark(&t);
const double elapsed_secs =
- static_cast<double>(vpx_usec_timer_elapsed(&t)) / kUsecsInSec;
+ static_cast<double>(aom_usec_timer_elapsed(&t)) / kUsecsInSec;
const unsigned decode_frames = decode_video.frame_number();
const double fps = static_cast<double>(decode_frames) / elapsed_secs;
@@ -255,6 +255,6 @@
printf("}\n");
}
-VP10_INSTANTIATE_TEST_CASE(VP9NewEncodeDecodePerfTest,
- ::testing::Values(::libaom_test::kTwoPassGood));
+AV1_INSTANTIATE_TEST_CASE(AV1NewEncodeDecodePerfTest,
+ ::testing::Values(::libaom_test::kTwoPassGood));
} // namespace
