diff options
| author | Angie Chiang <angiebird@google.com> | 2020-10-20 17:32:27 -0700 |
|---|---|---|
| committer | Angie Chiang <angiebird@google.com> | 2020-10-20 17:32:27 -0700 |
| commit | a207a0f6b9af8e05e4379d5a8f29f549d3b32c61 (patch) | |
| tree | 28d58397993f46d4064122fd4f86d3a3902dc657 | |
| parent | 9bfdf4a9d0c35706012fdcf7657d57c68bca0eb8 (diff) | |
| download | libvpx-a207a0f6b9af8e05e4379d5a8f29f549d3b32c61.tar libvpx-a207a0f6b9af8e05e4379d5a8f29f549d3b32c61.tar.gz libvpx-a207a0f6b9af8e05e4379d5a8f29f549d3b32c61.tar.bz2 libvpx-a207a0f6b9af8e05e4379d5a8f29f549d3b32c61.zip | |
Small changes of vp9_ext_ratectrl_test.cc
Change-Id: I27932c41a826cd3c10cc7801956cd32e4877133a
| -rw-r--r-- | test/vp9_ext_ratectrl_test.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/test/vp9_ext_ratectrl_test.cc b/test/vp9_ext_ratectrl_test.cc index 708718164..a8c4032d4 100644 --- a/test/vp9_ext_ratectrl_test.cc +++ b/test/vp9_ext_ratectrl_test.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include <new> + #include "test/codec_factory.h" #include "test/encode_test_driver.h" #include "test/util.h" @@ -18,7 +20,7 @@ namespace { constexpr int kModelMagicNumber = 51396; -constexpr unsigned int PrivMagicNumber = 5566UL; +constexpr unsigned int PrivMagicNumber = 5566; constexpr int kFrameNum = 5; constexpr int kLosslessCodingIndex = 2; @@ -34,7 +36,7 @@ vpx_rc_status_t rc_create_model(void *priv, EXPECT_NE(toy_rate_ctrl, nullptr); toy_rate_ctrl->magic_number = kModelMagicNumber; toy_rate_ctrl->coding_index = -1; - *rate_ctrl_model_pt = (vpx_rc_model_t)toy_rate_ctrl; + *rate_ctrl_model_pt = toy_rate_ctrl; EXPECT_EQ(priv, reinterpret_cast<void *>(PrivMagicNumber)); EXPECT_EQ(ratectrl_config->frame_width, 352); EXPECT_EQ(ratectrl_config->frame_height, 288); @@ -128,7 +130,7 @@ vpx_rc_status_t rc_update_encodeframe_result( static_cast<ToyRateCtrl *>(rate_ctrl_model); EXPECT_EQ(toy_rate_ctrl->magic_number, kModelMagicNumber); - int64_t ref_pixel_count = 352 * 288 * 3 / 2; + const int64_t ref_pixel_count = 352 * 288 * 3 / 2; EXPECT_EQ(encode_frame_result->pixel_count, ref_pixel_count); if (toy_rate_ctrl->coding_index == kLosslessCodingIndex) { EXPECT_EQ(encode_frame_result->sse, 0); @@ -174,11 +176,12 @@ TEST_F(ExtRateCtrlTest, EncodeTest) { cfg_.rc_target_bitrate = 24000; std::unique_ptr<libvpx_test::VideoSource> video; - video.reset(new libvpx_test::YUVVideoSource("bus_352x288_420_f20_b8.yuv", - VPX_IMG_FMT_I420, 352, 288, 30, 1, - 0, kFrameNum)); + video.reset(new (std::nothrow) libvpx_test::YUVVideoSource( + "bus_352x288_420_f20_b8.yuv", VPX_IMG_FMT_I420, 352, 288, 30, 1, 0, + kFrameNum)); ASSERT_NE(video.get(), nullptr); ASSERT_NO_FATAL_FAILURE(RunLoop(video.get())); } + } // namespace |