From 9aeaeb7df47668e267ee9fffa9fdfaceaaa1ac2f Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 20 Apr 2017 13:20:28 -0700 Subject: [PATCH] tests: use scoped_ptr for local video source vars prevents leak / static analysis warnings on ASSERT*() failures BUG=aomedia:447 Change-Id: I1d3edbdbb18dbbe3b17691971348a8121cf09afa --- test/encoder_parms_get_to_decoder.cc | 9 ++++----- test/end_to_end_test.cc | 16 ++++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/test/encoder_parms_get_to_decoder.cc b/test/encoder_parms_get_to_decoder.cc index 4c0486930..ca6a24ebe 100644 --- a/test/encoder_parms_get_to_decoder.cc +++ b/test/encoder_parms_get_to_decoder.cc @@ -134,12 +134,11 @@ class AvxEncoderParmsGetToDecoder TEST_P(AvxEncoderParmsGetToDecoder, BitstreamParms) { init_flags_ = AOM_CODEC_USE_PSNR; - libaom_test::VideoSource *const video = - new libaom_test::Y4mVideoSource(test_video_.name, 0, test_video_.frames); - ASSERT_TRUE(video != NULL); + testing::internal::scoped_ptr video( + new libaom_test::Y4mVideoSource(test_video_.name, 0, test_video_.frames)); + ASSERT_TRUE(video.get() != NULL); - ASSERT_NO_FATAL_FAILURE(RunLoop(video)); - delete video; + ASSERT_NO_FATAL_FAILURE(RunLoop(video.get())); } AV1_INSTANTIATE_TEST_CASE(AvxEncoderParmsGetToDecoder, diff --git a/test/end_to_end_test.cc b/test/end_to_end_test.cc index 59b896be5..dca7e490d 100644 --- a/test/end_to_end_test.cc +++ b/test/end_to_end_test.cc @@ -171,20 +171,20 @@ TEST_P(EndToEndTestLarge, EndtoEndPSNRTest) { init_flags_ = AOM_CODEC_USE_PSNR; if (cfg_.g_bit_depth > 8) init_flags_ |= AOM_CODEC_USE_HIGHBITDEPTH; - libaom_test::VideoSource *video; + testing::internal::scoped_ptr video; if (is_extension_y4m(test_video_param_.filename)) { - video = - new libaom_test::Y4mVideoSource(test_video_param_.filename, 0, kFrames); + video.reset(new libaom_test::Y4mVideoSource(test_video_param_.filename, 0, + kFrames)); } else { - video = new libaom_test::YUVVideoSource(test_video_param_.filename, - test_video_param_.fmt, kWidth, - kHeight, kFramerate, 1, 0, kFrames); + video.reset(new libaom_test::YUVVideoSource( + test_video_param_.filename, test_video_param_.fmt, kWidth, kHeight, + kFramerate, 1, 0, kFrames)); } + ASSERT_TRUE(video.get() != NULL); - ASSERT_NO_FATAL_FAILURE(RunLoop(video)); + ASSERT_NO_FATAL_FAILURE(RunLoop(video.get())); const double psnr = GetAveragePsnr(); EXPECT_GT(psnr, GetPsnrThreshold()); - delete (video); } AV1_INSTANTIATE_TEST_CASE(EndToEndTestLarge, -- GitLab