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

Port folder renaming changes from AOM

Browse Source 
Manually cherry-picked commits:
ceef058 libvpx->libaom part2
3d26d91 libvpx -> libaom
cfea7dd vp10/ -> av1/
3a8eff7 Fix a build issue for a test
bf4202e Rename vpx to aom

Change-Id: I1b0eb5a40796e3aaf41c58984b4229a439a597dc
This commit is contained in:
Yaowu Xu
2016-08-22 16:08:15 -07:00
parent b1fb998c46
commit c27fc14b02
656 changed files with 3586 additions and 2434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/encode_test_driver.h
View File

@@ -17,11 +17,11 @@
#include "./vpx_config.h"
#if CONFIG_VP10_ENCODER
#include "vpx/vp8cx.h"
#include "aom/vp8cx.h"
#endif
#include "vpx/vpx_encoder.h"
#include "aom/vpx_encoder.h"
namespace libvpx_test {
namespace libaom_test {
class CodecFactory;
class VideoSource;
@@ -34,18 +34,18 @@ enum TestMode {
kTwoPassBest
};
#define ALL_TEST_MODES \
::testing::Values(::libvpx_test::kRealTime, ::libvpx_test::kOnePassGood, \
::libvpx_test::kOnePassBest, ::libvpx_test::kTwoPassGood, \
::libvpx_test::kTwoPassBest)
::testing::Values(::libaom_test::kRealTime, ::libaom_test::kOnePassGood, \
::libaom_test::kOnePassBest, ::libaom_test::kTwoPassGood, \
::libaom_test::kTwoPassBest)
#define ONE_PASS_TEST_MODES \
::testing::Values(::libvpx_test::kRealTime, ::libvpx_test::kOnePassGood, \
::libvpx_test::kOnePassBest)
::testing::Values(::libaom_test::kRealTime, ::libaom_test::kOnePassGood, \
::libaom_test::kOnePassBest)
#define TWO_PASS_TEST_MODES \
::testing::Values(::libvpx_test::kTwoPassGood, ::libvpx_test::kTwoPassBest)
::testing::Values(::libaom_test::kTwoPassGood, ::libaom_test::kTwoPassBest)
// Provides an object to handle the libvpx get_cx_data() iteration pattern
// Provides an object to handle the libaom get_cx_data() iteration pattern
class CxDataIterator {
public:
explicit CxDataIterator(vpx_codec_ctx_t *encoder)
@@ -60,7 +60,7 @@ class CxDataIterator {
vpx_codec_iter_t iter_;
};
// Implements an in-memory store for libvpx twopass statistics
// Implements an in-memory store for libaom twopass statistics
class TwopassStatsStore {
public:
void Append(const vpx_codec_cx_pkt_t &pkt) {
@@ -250,6 +250,6 @@ class EncoderTest {
vpx_codec_pts_t last_pts_;
};
} // namespace libvpx_test
} // namespace libaom_test
#endif // TEST_ENCODE_TEST_DRIVER_H_