Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away
BUG= R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/36229004 Cr-Commit-Position: refs/heads/master@{#8517} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -19,7 +19,7 @@ TEST_F(VideoProcessingModuleTest, BrightnessDetection)
|
||||
uint32_t frameNum = 0;
|
||||
int32_t brightnessWarning = 0;
|
||||
uint32_t warningCount = 0;
|
||||
scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
rtc::scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
|
||||
frame_length_)
|
||||
{
|
||||
|
||||
@ -39,7 +39,7 @@ TEST_F(VideoProcessingModuleTest, ColorEnhancement)
|
||||
ASSERT_TRUE(modFile != NULL) << "Could not open output file.\n";
|
||||
|
||||
uint32_t frameNum = 0;
|
||||
scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
rtc::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_ptr<uint8_t[]> ref_buffer(new uint8_t[frame_length_]);
|
||||
rtc::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_ptr<uint8_t[]> testFrame(new uint8_t[frame_length_]);
|
||||
rtc::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.
|
||||
|
||||
@ -23,7 +23,7 @@ TEST_F(VideoProcessingModuleTest, ContentAnalysis) {
|
||||
ca__c.Initialize(width_,height_);
|
||||
ca__sse.Initialize(width_,height_);
|
||||
|
||||
scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
rtc::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.
|
||||
|
||||
@ -43,7 +43,7 @@ TEST_F(VideoProcessingModuleTest, Deflickering)
|
||||
"Could not open output file: " << output_file << "\n";
|
||||
|
||||
printf("\nRun time [us / frame]:\n");
|
||||
scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
rtc::scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
for (uint32_t run_idx = 0; run_idx < NumRuns; run_idx++)
|
||||
{
|
||||
TickTime t0;
|
||||
|
||||
@ -103,7 +103,7 @@ TEST_F(VideoProcessingModuleTest, HandleNullBuffer) {
|
||||
|
||||
TEST_F(VideoProcessingModuleTest, HandleBadStats) {
|
||||
VideoProcessingModule::FrameStats stats;
|
||||
scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
rtc::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,
|
||||
@ -140,7 +140,7 @@ TEST_F(VideoProcessingModuleTest, IdenticalResultsAfterReset) {
|
||||
I420VideoFrame video_frame2;
|
||||
VideoProcessingModule::FrameStats stats;
|
||||
// Only testing non-static functions here.
|
||||
scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
rtc::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,
|
||||
@ -170,7 +170,7 @@ TEST_F(VideoProcessingModuleTest, IdenticalResultsAfterReset) {
|
||||
|
||||
TEST_F(VideoProcessingModuleTest, FrameStats) {
|
||||
VideoProcessingModule::FrameStats stats;
|
||||
scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
rtc::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,
|
||||
@ -230,7 +230,7 @@ TEST_F(VideoProcessingModuleTest, Resampler) {
|
||||
vpm_->EnableTemporalDecimation(false);
|
||||
|
||||
// Reading test frame
|
||||
scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
||||
rtc::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.
|
||||
|
||||
Reference in New Issue
Block a user