diff options
author | John Koleszar <jkoleszar@google.com> | 2012-11-06 16:59:01 -0800 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2012-11-07 11:30:16 -0800 |
commit | 7b8dfcb5a2cfb01ee7a6009d945d06559b564d06 (patch) | |
tree | 29365387746cff257aede84bf84525435b3d948b /test/config_test.cc | |
parent | 82b1a3433df1705e73d83eaeb9731f67c29c8883 (diff) | |
parent | 3c8007f19ecd612a9e3c462b83f7ab740546f8f9 (diff) | |
download | libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar.gz libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar.bz2 libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.zip |
Rough merge of master into experimental
Creates a merge between the master and experimental branches. Fixes a
number of conflicts in the build system to allow *either* VP8 or VP9
to be built. Specifically either:
$ configure --disable-vp9 $ configure --disable-vp8
--disable-unit-tests
VP9 still exports its symbols and files as VP8, so that will be
resolved in the next commit.
Unit tests are broken in VP9, but this isn't a new issue. They are
fixed upstream on origin/experimental as of this writing, but rebasing
this merge proved difficult, so will tackle that in a second merge
commit.
Change-Id: I2b7d852c18efd58d1ebc621b8041fe0260442c21
Diffstat (limited to 'test/config_test.cc')
-rw-r--r-- | test/config_test.cc | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/test/config_test.cc b/test/config_test.cc new file mode 100644 index 000000000..c4da46e2e --- /dev/null +++ b/test/config_test.cc @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2012 The WebM project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ +#include "third_party/googletest/src/include/gtest/gtest.h" +#include "test/encode_test_driver.h" +#include "test/video_source.h" + +namespace { + +class ConfigTest : public ::libvpx_test::EncoderTest, + public ::testing::TestWithParam<enum libvpx_test::TestMode> { + public: + ConfigTest() : frame_count_in_(0), frame_count_out_(0), frame_count_max_(0) {} + + protected: + virtual void SetUp() { + InitializeConfig(); + SetMode(GetParam()); + } + + virtual void BeginPassHook(unsigned int /*pass*/) { + frame_count_in_ = 0; + frame_count_out_ = 0; + } + + virtual void PreEncodeFrameHook(libvpx_test::VideoSource* /*video*/) { + ++frame_count_in_; + abort_ |= (frame_count_in_ >= frame_count_max_); + } + + virtual void FramePktHook(const vpx_codec_cx_pkt_t* /*pkt*/) { + ++frame_count_out_; + } + + virtual bool Continue() const { + return !HasFatalFailure() && !abort_; + } + + unsigned int frame_count_in_; + unsigned int frame_count_out_; + unsigned int frame_count_max_; +}; + +TEST_P(ConfigTest, LagIsDisabled) { + frame_count_max_ = 2; + cfg_.g_lag_in_frames = 15; + + libvpx_test::DummyVideoSource video; + ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); + + EXPECT_EQ(frame_count_in_, frame_count_out_); +} + +INSTANTIATE_TEST_CASE_P(OnePassModes, ConfigTest, ONE_PASS_TEST_MODES); +} // namespace |