diff options
Diffstat (limited to 'chromium/third_party/webrtc/common_video/libyuv/libyuv_unittest.cc')
| -rw-r--r-- | chromium/third_party/webrtc/common_video/libyuv/libyuv_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chromium/third_party/webrtc/common_video/libyuv/libyuv_unittest.cc b/chromium/third_party/webrtc/common_video/libyuv/libyuv_unittest.cc index 3df520ed6cb..0abe7f3cc0e 100644 --- a/chromium/third_party/webrtc/common_video/libyuv/libyuv_unittest.cc +++ b/chromium/third_party/webrtc/common_video/libyuv/libyuv_unittest.cc @@ -84,7 +84,7 @@ class TestLibYuv : public ::testing::Test { FILE* source_file_; I420VideoFrame orig_frame_; - scoped_array<uint8_t> orig_buffer_; + scoped_ptr<uint8_t[]> orig_buffer_; const int width_; const int height_; const int size_y_; @@ -147,7 +147,7 @@ TEST_F(TestLibYuv, ConvertTest) { (width_ + 1) / 2, (width_ + 1) / 2)); printf("\nConvert #%d I420 <-> I420 \n", j); - scoped_array<uint8_t> out_i420_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> out_i420_buffer(new uint8_t[frame_length_]); EXPECT_EQ(0, ConvertFromI420(orig_frame_, kI420, 0, out_i420_buffer.get())); EXPECT_EQ(0, ConvertToI420(kI420, out_i420_buffer.get(), 0, 0, @@ -162,7 +162,7 @@ TEST_F(TestLibYuv, ConvertTest) { j++; printf("\nConvert #%d I420 <-> RGB24\n", j); - scoped_array<uint8_t> res_rgb_buffer2(new uint8_t[width_ * height_ * 3]); + scoped_ptr<uint8_t[]> res_rgb_buffer2(new uint8_t[width_ * height_ * 3]); // Align the stride values for the output frame. int stride_y = 0; int stride_uv = 0; @@ -184,7 +184,7 @@ TEST_F(TestLibYuv, ConvertTest) { j++; printf("\nConvert #%d I420 <-> UYVY\n", j); - scoped_array<uint8_t> out_uyvy_buffer(new uint8_t[width_ * height_ * 2]); + scoped_ptr<uint8_t[]> out_uyvy_buffer(new uint8_t[width_ * height_ * 2]); EXPECT_EQ(0, ConvertFromI420(orig_frame_, kUYVY, 0, out_uyvy_buffer.get())); EXPECT_EQ(0, ConvertToI420(kUYVY, out_uyvy_buffer.get(), 0, 0, width_, height_, 0, kRotateNone, &res_i420_frame)); @@ -196,8 +196,8 @@ TEST_F(TestLibYuv, ConvertTest) { j++; printf("\nConvert #%d I420 <-> YV12\n", j); - scoped_array<uint8_t> outYV120Buffer(new uint8_t[frame_length_]); - scoped_array<uint8_t> res_i420_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> outYV120Buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> res_i420_buffer(new uint8_t[frame_length_]); I420VideoFrame yv12_frame; EXPECT_EQ(0, ConvertFromI420(orig_frame_, kYV12, 0, outYV120Buffer.get())); yv12_frame.CreateFrame(size_y_, outYV120Buffer.get(), @@ -218,7 +218,7 @@ TEST_F(TestLibYuv, ConvertTest) { j++; printf("\nConvert #%d I420 <-> YUY2\n", j); - scoped_array<uint8_t> out_yuy2_buffer(new uint8_t[width_ * height_ * 2]); + scoped_ptr<uint8_t[]> out_yuy2_buffer(new uint8_t[width_ * height_ * 2]); EXPECT_EQ(0, ConvertFromI420(orig_frame_, kYUY2, 0, out_yuy2_buffer.get())); EXPECT_EQ(0, ConvertToI420(kYUY2, out_yuy2_buffer.get(), 0, 0, width_, @@ -231,7 +231,7 @@ TEST_F(TestLibYuv, ConvertTest) { psnr = I420PSNR(&orig_frame_, &res_i420_frame); EXPECT_EQ(48.0, psnr); printf("\nConvert #%d I420 <-> RGB565\n", j); - scoped_array<uint8_t> out_rgb565_buffer(new uint8_t[width_ * height_ * 2]); + scoped_ptr<uint8_t[]> out_rgb565_buffer(new uint8_t[width_ * height_ * 2]); EXPECT_EQ(0, ConvertFromI420(orig_frame_, kRGB565, 0, out_rgb565_buffer.get())); @@ -250,7 +250,7 @@ TEST_F(TestLibYuv, ConvertTest) { EXPECT_GT(ceil(psnr), 40); printf("\nConvert #%d I420 <-> ARGB8888\n", j); - scoped_array<uint8_t> out_argb8888_buffer(new uint8_t[width_ * height_ * 4]); + scoped_ptr<uint8_t[]> out_argb8888_buffer(new uint8_t[width_ * height_ * 4]); EXPECT_EQ(0, ConvertFromI420(orig_frame_, kARGB, 0, out_argb8888_buffer.get())); @@ -283,7 +283,7 @@ TEST_F(TestLibYuv, ConvertAlignedFrame) { Calc16ByteAlignedStride(width_, &stride_y, &stride_uv); EXPECT_EQ(0,res_i420_frame.CreateEmptyFrame(width_, height_, stride_y, stride_uv, stride_uv)); - scoped_array<uint8_t> out_i420_buffer(new uint8_t[frame_length_]); + scoped_ptr<uint8_t[]> out_i420_buffer(new uint8_t[frame_length_]); EXPECT_EQ(0, ConvertFromI420(orig_frame_, kI420, 0, out_i420_buffer.get())); EXPECT_EQ(0, ConvertToI420(kI420, out_i420_buffer.get(), 0, 0, |