diff options
author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-25 23:10:28 +0000 |
---|---|---|
committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-25 23:10:28 +0000 |
commit | ba47616ee5a8d8a4d94e160b64b79a56845e291b (patch) | |
tree | 1b7c6445147e8d271e3bf09b381d69d800f2dd01 /modules/video_processing/main | |
parent | b10fcf5bca8208c5330acad5122c80a17e8226dd (diff) | |
download | webrtc-ba47616ee5a8d8a4d94e160b64b79a56845e291b.tar.gz |
Replace scoped_array<T> with scoped_ptr<T[]>.
scoped_array is deprecated. This was done using a Chromium clang tool:
http://src.chromium.org/viewvc/chrome/trunk/src/tools/clang/rewrite_scoped_ar...
except for the few not-built-on-Linux files which were updated manually.
TESTED=trybots
BUG=2515
R=niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12429004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5985 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules/video_processing/main')
6 files changed, 11 insertions, 11 deletions
diff --git a/modules/video_processing/main/test/unit_test/brightness_detection_test.cc b/modules/video_processing/main/test/unit_test/brightness_detection_test.cc index d7ac7290..c53c1fb8 100644 --- a/modules/video_processing/main/test/unit_test/brightness_detection_test.cc +++ b/modules/video_processing/main/test/unit_test/brightness_detection_test.cc @@ -19,7 +19,7 @@ TEST_F(VideoProcessingModuleTest, BrightnessDetection) uint32_t frameNum = 0; int32_t brightnessWarning = 0; uint32_t warningCount = 0; - scoped_array<uint8_t> video_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]); while (fread(video_buffer.get(), 1, frame_length_, source_file_) == frame_length_) { diff --git a/modules/video_processing/main/test/unit_test/color_enhancement_test.cc b/modules/video_processing/main/test/unit_test/color_enhancement_test.cc index fc560bef..c1cd4623 100644 --- a/modules/video_processing/main/test/unit_test/color_enhancement_test.cc +++ b/modules/video_processing/main/test/unit_test/color_enhancement_test.cc @@ -39,7 +39,7 @@ TEST_F(VideoProcessingModuleTest, ColorEnhancement) ASSERT_TRUE(modFile != NULL) << "Could not open output file.\n"; uint32_t frameNum = 0; - scoped_array<uint8_t> video_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]); while (fread(video_buffer.get(), 1, frame_length_, source_file_) == frame_length_) { @@ -86,7 +86,7 @@ TEST_F(VideoProcessingModuleTest, ColorEnhancement) width_, half_width_, half_width_); // Compare frame-by-frame. - scoped_array<uint8_t> ref_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> ref_buffer(new uint8_t[frame_length_]); while (fread(video_buffer.get(), 1, frame_length_, modFile) == frame_length_) { @@ -114,7 +114,7 @@ TEST_F(VideoProcessingModuleTest, ColorEnhancement) // Verify that all color pixels are enhanced, and no luminance values are // altered. - scoped_array<uint8_t> testFrame(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> testFrame(new uint8_t[frame_length_]); // Use value 128 as probe value, since we know that this will be changed // in the enhancement. diff --git a/modules/video_processing/main/test/unit_test/content_metrics_test.cc b/modules/video_processing/main/test/unit_test/content_metrics_test.cc index 36a1ad76..c0d1ab43 100644 --- a/modules/video_processing/main/test/unit_test/content_metrics_test.cc +++ b/modules/video_processing/main/test/unit_test/content_metrics_test.cc @@ -23,7 +23,7 @@ TEST_F(VideoProcessingModuleTest, ContentAnalysis) { ca__c.Initialize(width_,height_); ca__sse.Initialize(width_,height_); - scoped_array<uint8_t> video_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]); while (fread(video_buffer.get(), 1, frame_length_, source_file_) == frame_length_) { // Using ConvertToI420 to add stride to the image. diff --git a/modules/video_processing/main/test/unit_test/deflickering_test.cc b/modules/video_processing/main/test/unit_test/deflickering_test.cc index 0fa3f48b..1bf53fc8 100644 --- a/modules/video_processing/main/test/unit_test/deflickering_test.cc +++ b/modules/video_processing/main/test/unit_test/deflickering_test.cc @@ -43,7 +43,7 @@ TEST_F(VideoProcessingModuleTest, Deflickering) "Could not open output file: " << output_file << "\n"; printf("\nRun time [us / frame]:\n"); - scoped_array<uint8_t> video_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]); for (uint32_t run_idx = 0; run_idx < NumRuns; run_idx++) { TickTime t0; diff --git a/modules/video_processing/main/test/unit_test/denoising_test.cc b/modules/video_processing/main/test/unit_test/denoising_test.cc index 3023a2d7..c00db6ab 100644 --- a/modules/video_processing/main/test/unit_test/denoising_test.cc +++ b/modules/video_processing/main/test/unit_test/denoising_test.cc @@ -49,7 +49,7 @@ TEST_F(VideoProcessingModuleTest, DISABLED_ON_ANDROID(Denoising)) int32_t modifiedPixels = 0; frameNum = 0; - scoped_array<uint8_t> video_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]); while (fread(video_buffer.get(), 1, frame_length_, source_file_) == frame_length_) { diff --git a/modules/video_processing/main/test/unit_test/video_processing_unittest.cc b/modules/video_processing/main/test/unit_test/video_processing_unittest.cc index 6e549230..9d70e67a 100644 --- a/modules/video_processing/main/test/unit_test/video_processing_unittest.cc +++ b/modules/video_processing/main/test/unit_test/video_processing_unittest.cc @@ -89,7 +89,7 @@ TEST_F(VideoProcessingModuleTest, HandleNullBuffer) { TEST_F(VideoProcessingModuleTest, HandleBadStats) { VideoProcessingModule::FrameStats stats; - scoped_array<uint8_t> video_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]); ASSERT_EQ(frame_length_, fread(video_buffer.get(), 1, frame_length_, source_file_)); EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, @@ -129,7 +129,7 @@ TEST_F(VideoProcessingModuleTest, IdenticalResultsAfterReset) { I420VideoFrame video_frame2; VideoProcessingModule::FrameStats stats; // Only testing non-static functions here. - scoped_array<uint8_t> video_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]); ASSERT_EQ(frame_length_, fread(video_buffer.get(), 1, frame_length_, source_file_)); EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, @@ -172,7 +172,7 @@ TEST_F(VideoProcessingModuleTest, IdenticalResultsAfterReset) { TEST_F(VideoProcessingModuleTest, FrameStats) { VideoProcessingModule::FrameStats stats; - scoped_array<uint8_t> video_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]); ASSERT_EQ(frame_length_, fread(video_buffer.get(), 1, frame_length_, source_file_)); EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, @@ -242,7 +242,7 @@ TEST_F(VideoProcessingModuleTest, Resampler) { vpm_->EnableTemporalDecimation(false); // Reading test frame - scoped_array<uint8_t> video_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]); ASSERT_EQ(frame_length_, fread(video_buffer.get(), 1, frame_length_, source_file_)); // Using ConvertToI420 to add stride to the image. |