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

20
test/y4m_video_source.h
View File

@@ -22,12 +22,12 @@ namespace libaom_test {
class Y4mVideoSource : public VideoSource {
public:
Y4mVideoSource(const std::string &file_name, unsigned int start, int limit)
: file_name_(file_name), input_file_(NULL), img_(new vpx_image_t()),
: file_name_(file_name), input_file_(NULL), img_(new aom_image_t()),
start_(start), limit_(limit), frame_(0), framerate_numerator_(0),
framerate_denominator_(0), y4m_() {}
virtual ~Y4mVideoSource() {
vpx_img_free(img_.get());
aom_img_free(img_.get());
CloseSource();
}
@@ -60,17 +60,17 @@ class Y4mVideoSource : public VideoSource {
FillFrame();
}
virtual vpx_image_t *img() const {
virtual aom_image_t *img() const {
return (frame_ < limit_) ? img_.get() : NULL;
}
// Models a stream where Timebase = 1/FPS, so pts == frame.
virtual vpx_codec_pts_t pts() const { return frame_; }
virtual aom_codec_pts_t pts() const { return frame_; }
virtual unsigned long duration() const { return 1; }
virtual vpx_rational_t timebase() const {
const vpx_rational_t t = { framerate_denominator_, framerate_numerator_ };
virtual aom_rational_t timebase() const {
const aom_rational_t t = { framerate_denominator_, framerate_numerator_ };
return t;
}
@@ -86,11 +86,11 @@ class Y4mVideoSource : public VideoSource {
// Swap buffers with another y4m source. This allows reading a new frame
// while keeping the old frame around. A whole Y4mSource is required and
// not just a vpx_image_t because of how the y4m reader manipulates
// vpx_image_t internals,
// not just a aom_image_t because of how the y4m reader manipulates
// aom_image_t internals,
void SwapBuffers(Y4mVideoSource *other) {
std::swap(other->y4m_.dst_buf, y4m_.dst_buf);
vpx_image_t *tmp;
aom_image_t *tmp;
tmp = other->img_.release();
other->img_.reset(img_.release());
img_.reset(tmp);
@@ -108,7 +108,7 @@ class Y4mVideoSource : public VideoSource {
std::string file_name_;
FILE *input_file_;
testing::internal::scoped_ptr<vpx_image_t> img_;
testing::internal::scoped_ptr<aom_image_t> img_;
unsigned int start_;
unsigned int limit_;
unsigned int frame_;