commit 12ca90d383fc209f12bfa6e205ddcd993b33decb
author Alex Converse <aconverse@google.com> Thu Jul 21 11:38:27 2016 -0700
committer Yaowu Xu <yaowu@google.com> Tue Jul 26 04:11:56 2016 +0000
tree 9ef903ccc3e4dc520aebbad8118e1874032ff6c6
parent 74e230336f134e5fcffc6073e1a2961eaea913a5

MinArfFreqTest: Don't leak video on failure.

Change-Id: I250379f0ac8d4929c9032e7343290e2980fc2e77

test/vp9_arf_freq_test.cc

diff --git a/test/vp9_arf_freq_test.cc b/test/vp9_arf_freq_test.cc
index ecbcf92..984e379 100644
--- a/test/vp9_arf_freq_test.cc
+++ b/test/vp9_arf_freq_test.cc
@@ -200,28 +200,27 @@
   if (cfg_.g_bit_depth > 8)
     init_flags_ |= VPX_CODEC_USE_HIGHBITDEPTH;
 
-  libvpx_test::VideoSource *video;
+  testing::internal::scoped_ptr<libvpx_test::VideoSource> video;
   if (is_extension_y4m(test_video_param_.filename)) {
-    video = new libvpx_test::Y4mVideoSource(test_video_param_.filename,
-                                            0, kFrames);
+    video.reset(new libvpx_test::Y4mVideoSource(test_video_param_.filename,
+                                                0, kFrames));
   } else {
-    video = new libvpx_test::YUVVideoSource(test_video_param_.filename,
-                                            test_video_param_.fmt,
-                                            test_video_param_.width,
-                                            test_video_param_.height,
-                                            test_video_param_.framerate_num,
-                                            test_video_param_.framerate_den,
-                                            0, kFrames);
+    video.reset(new libvpx_test::YUVVideoSource(test_video_param_.filename,
+                                                test_video_param_.fmt,
+                                                test_video_param_.width,
+                                                test_video_param_.height,
+                                                test_video_param_.framerate_num,
+                                                test_video_param_.framerate_den,
+                                                0, kFrames));
   }
 
-  ASSERT_NO_FATAL_FAILURE(RunLoop(video));
+  ASSERT_NO_FATAL_FAILURE(RunLoop(video.get()));
   const int min_run = GetMinVisibleRun();
   const int min_arf_dist_requested = GetMinArfDistanceRequested();
   if (min_run != ARF_NOT_SEEN && min_run != ARF_SEEN_ONCE) {
     const int min_arf_dist = min_run + 1;
     EXPECT_GE(min_arf_dist, min_arf_dist_requested);
   }
-  delete(video);
 }
 
 VP9_INSTANTIATE_TEST_CASE(