Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/media/base/videoframe_unittest.h

Issue 1728503002: Replace scoped_ptr with unique_ptr in webrtc/media/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up1
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/base/videoengine_unittest.h ('k') | webrtc/media/base/videoframefactory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/videoframe_unittest.h
diff --git a/webrtc/media/base/videoframe_unittest.h b/webrtc/media/base/videoframe_unittest.h
index 8f945f3f3faacc237ebeff777db82e8ee1a84a15..88119fd672f14e0776f0dbd35d5773dee0fc0e40 100644
--- a/webrtc/media/base/videoframe_unittest.h
+++ b/webrtc/media/base/videoframe_unittest.h
@@ -12,6 +12,7 @@
#define WEBRTC_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_
#include <algorithm>
+#include <memory>
#include <string>
#include "libyuv/convert.h"
@@ -81,7 +82,7 @@ class VideoFrameTest : public testing::Test {
int dh,
webrtc::VideoRotation rotation,
T* frame) {
- rtc::scoped_ptr<rtc::MemoryStream> ms(LoadSample(filename));
+ std::unique_ptr<rtc::MemoryStream> ms(LoadSample(filename));
return LoadFrame(ms.get(), format, width, height, dw, dh, rotation, frame);
}
// Load a video frame from a memory stream.
@@ -142,7 +143,7 @@ class VideoFrameTest : public testing::Test {
rtc::MemoryStream* LoadSample(const std::string& filename) {
rtc::Pathname path(cricket::GetTestFilePath(filename));
- rtc::scoped_ptr<rtc::FileStream> fs(
+ std::unique_ptr<rtc::FileStream> fs(
rtc::Filesystem::OpenFile(path, "rb"));
if (!fs.get()) {
LOG(LS_ERROR) << "Could not open test file path: " << path.pathname()
@@ -152,7 +153,7 @@ class VideoFrameTest : public testing::Test {
}
char buf[4096];
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
new rtc::MemoryStream());
rtc::StreamResult res = Flow(fs.get(), buf, sizeof(buf), ms.get());
if (res != rtc::SR_SUCCESS) {
@@ -165,7 +166,7 @@ class VideoFrameTest : public testing::Test {
bool DumpSample(const std::string& filename, const void* buffer, int size) {
rtc::Pathname path(filename);
- rtc::scoped_ptr<rtc::FileStream> fs(
+ std::unique_ptr<rtc::FileStream> fs(
rtc::Filesystem::OpenFile(path, "wb"));
if (!fs.get()) {
return false;
@@ -188,7 +189,7 @@ class VideoFrameTest : public testing::Test {
return NULL;
}
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
new rtc::MemoryStream);
int awidth = (width + 1) & ~1;
int size = awidth * 2 * height;
@@ -212,7 +213,7 @@ class VideoFrameTest : public testing::Test {
rtc::MemoryStream* CreateYuvSample(uint32_t width,
uint32_t height,
uint32_t bpp) {
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
new rtc::MemoryStream);
if (!ms->ReserveSize(width * height * bpp / 8)) {
return NULL;
@@ -233,7 +234,7 @@ class VideoFrameTest : public testing::Test {
return NULL;
}
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
new rtc::MemoryStream);
if (!ms->ReserveSize(width * height * bytes)) {
return NULL;
@@ -505,7 +506,7 @@ class VideoFrameTest : public testing::Test {
void ConstructI420() {
T frame;
EXPECT_TRUE(IsNull(frame));
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuvSample(kWidth, kHeight, 12));
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_I420,
kWidth, kHeight, &frame));
@@ -520,7 +521,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a YV12 buffer.
void ConstructYV12() {
T frame;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuvSample(kWidth, kHeight, 12));
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_YV12,
kWidth, kHeight, &frame));
@@ -537,7 +538,7 @@ class VideoFrameTest : public testing::Test {
T frame1, frame2;
ASSERT_TRUE(LoadFrameNoRepeat(&frame1));
size_t buf_size = kWidth * kHeight * 2;
- rtc::scoped_ptr<uint8_t[]> buf(new uint8_t[buf_size + kAlignment]);
+ std::unique_ptr<uint8_t[]> buf(new uint8_t[buf_size + kAlignment]);
uint8_t* y = ALIGNP(buf.get(), kAlignment);
uint8_t* u = y + kWidth * kHeight;
uint8_t* v = u + (kWidth / 2) * kHeight;
@@ -558,7 +559,7 @@ class VideoFrameTest : public testing::Test {
T frame1, frame2;
ASSERT_TRUE(LoadFrameNoRepeat(&frame1));
size_t buf_size = kWidth * kHeight * 2;
- rtc::scoped_ptr<uint8_t[]> buf(new uint8_t[buf_size + kAlignment]);
+ std::unique_ptr<uint8_t[]> buf(new uint8_t[buf_size + kAlignment]);
uint8_t* yuy2 = ALIGNP(buf.get(), kAlignment);
EXPECT_EQ(0, libyuv::I420ToYUY2(frame1.GetYPlane(), frame1.GetYPitch(),
frame1.GetUPlane(), frame1.GetUPitch(),
@@ -575,7 +576,7 @@ class VideoFrameTest : public testing::Test {
T frame1, frame2;
ASSERT_TRUE(LoadFrameNoRepeat(&frame1));
size_t buf_size = kWidth * kHeight * 2;
- rtc::scoped_ptr<uint8_t[]> buf(new uint8_t[buf_size + kAlignment + 1]);
+ std::unique_ptr<uint8_t[]> buf(new uint8_t[buf_size + kAlignment + 1]);
uint8_t* yuy2 = ALIGNP(buf.get(), kAlignment) + 1;
EXPECT_EQ(0, libyuv::I420ToYUY2(frame1.GetYPlane(), frame1.GetYPitch(),
frame1.GetUPlane(), frame1.GetUPitch(),
@@ -591,7 +592,7 @@ class VideoFrameTest : public testing::Test {
// Normal is 1280x720. Wide is 12800x72
void ConstructYuy2Wide() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_YUY2, kWidth * 10, kHeight / 10));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertYuv422(ms.get(), cricket::FOURCC_YUY2,
@@ -605,7 +606,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a UYVY buffer.
void ConstructUyvy() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_UYVY, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertYuv422(ms.get(), cricket::FOURCC_UYVY, kWidth, kHeight,
@@ -619,7 +620,7 @@ class VideoFrameTest : public testing::Test {
// We are merely verifying that the code succeeds and is free of crashes.
void ConstructM420() {
T frame;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuvSample(kWidth, kHeight, 12));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_M420,
@@ -628,7 +629,7 @@ class VideoFrameTest : public testing::Test {
void ConstructNV21() {
T frame;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuvSample(kWidth, kHeight, 12));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_NV21,
@@ -637,7 +638,7 @@ class VideoFrameTest : public testing::Test {
void ConstructNV12() {
T frame;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuvSample(kWidth, kHeight, 12));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_NV12,
@@ -648,7 +649,7 @@ class VideoFrameTest : public testing::Test {
// Due to rounding, some pixels may differ slightly from the VideoFrame impl.
void ConstructABGR() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateRgbSample(cricket::FOURCC_ABGR, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_ABGR, kWidth, kHeight,
@@ -662,7 +663,7 @@ class VideoFrameTest : public testing::Test {
// Due to rounding, some pixels may differ slightly from the VideoFrame impl.
void ConstructARGB() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateRgbSample(cricket::FOURCC_ARGB, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_ARGB, kWidth, kHeight,
@@ -676,7 +677,7 @@ class VideoFrameTest : public testing::Test {
// Normal is 1280x720. Wide is 12800x72
void ConstructARGBWide() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateRgbSample(cricket::FOURCC_ARGB, kWidth * 10, kHeight / 10));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_ARGB,
@@ -690,7 +691,7 @@ class VideoFrameTest : public testing::Test {
// Due to rounding, some pixels may differ slightly from the VideoFrame impl.
void ConstructBGRA() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateRgbSample(cricket::FOURCC_BGRA, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_BGRA, kWidth, kHeight,
@@ -704,7 +705,7 @@ class VideoFrameTest : public testing::Test {
// Due to rounding, some pixels may differ slightly from the VideoFrame impl.
void Construct24BG() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateRgbSample(cricket::FOURCC_24BG, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_24BG, kWidth, kHeight,
@@ -718,7 +719,7 @@ class VideoFrameTest : public testing::Test {
// Due to rounding, some pixels may differ slightly from the VideoFrame impl.
void ConstructRaw() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateRgbSample(cricket::FOURCC_RAW, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_RAW, kWidth, kHeight,
@@ -732,7 +733,7 @@ class VideoFrameTest : public testing::Test {
void ConstructRGB565() {
T frame1, frame2;
size_t out_size = kWidth * kHeight * 2;
- rtc::scoped_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
+ std::unique_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
uint8_t* out = ALIGNP(outbuf.get(), kAlignment);
T frame;
ASSERT_TRUE(LoadFrameNoRepeat(&frame1));
@@ -748,7 +749,7 @@ class VideoFrameTest : public testing::Test {
void ConstructARGB1555() {
T frame1, frame2;
size_t out_size = kWidth * kHeight * 2;
- rtc::scoped_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
+ std::unique_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
uint8_t* out = ALIGNP(outbuf.get(), kAlignment);
T frame;
ASSERT_TRUE(LoadFrameNoRepeat(&frame1));
@@ -764,7 +765,7 @@ class VideoFrameTest : public testing::Test {
void ConstructARGB4444() {
T frame1, frame2;
size_t out_size = kWidth * kHeight * 2;
- rtc::scoped_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
+ std::unique_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
uint8_t* out = ALIGNP(outbuf.get(), kAlignment);
T frame;
ASSERT_TRUE(LoadFrameNoRepeat(&frame1));
@@ -780,7 +781,7 @@ class VideoFrameTest : public testing::Test {
#define TEST_MIRROR(FOURCC, BPP) \
void Construct##FOURCC##Mirror() { \
T frame1, frame2, frame3; \
- rtc::scoped_ptr<rtc::MemoryStream> ms( \
+ std::unique_ptr<rtc::MemoryStream> ms( \
CreateYuvSample(kWidth, kHeight, BPP)); \
ASSERT_TRUE(ms.get() != NULL); \
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_##FOURCC, kWidth, \
@@ -811,7 +812,7 @@ class VideoFrameTest : public testing::Test {
#define TEST_ROTATE(FOURCC, BPP, ROTATE) \
void Construct##FOURCC##Rotate##ROTATE() { \
T frame1, frame2, frame3; \
- rtc::scoped_ptr<rtc::MemoryStream> ms( \
+ std::unique_ptr<rtc::MemoryStream> ms( \
CreateYuvSample(kWidth, kHeight, BPP)); \
ASSERT_TRUE(ms.get() != NULL); \
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_##FOURCC, kWidth, kHeight, \
@@ -865,7 +866,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a UYVY buffer rotated 90 degrees.
void ConstructUyvyRotate90() {
T frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_UYVY, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_UYVY, kWidth, kHeight,
@@ -875,7 +876,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a UYVY buffer rotated 180 degrees.
void ConstructUyvyRotate180() {
T frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_UYVY, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_UYVY, kWidth, kHeight,
@@ -886,7 +887,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a UYVY buffer rotated 270 degrees.
void ConstructUyvyRotate270() {
T frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_UYVY, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_UYVY, kWidth, kHeight,
@@ -897,7 +898,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a YUY2 buffer rotated 90 degrees.
void ConstructYuy2Rotate90() {
T frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_YUY2, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_YUY2, kWidth, kHeight,
@@ -907,7 +908,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a YUY2 buffer rotated 180 degrees.
void ConstructYuy2Rotate180() {
T frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_YUY2, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_YUY2, kWidth, kHeight,
@@ -918,7 +919,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a YUY2 buffer rotated 270 degrees.
void ConstructYuy2Rotate270() {
T frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_YUY2, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_YUY2, kWidth, kHeight,
@@ -968,7 +969,7 @@ class VideoFrameTest : public testing::Test {
}
// Convert back to ARGB.
size_t out_size = 4;
- rtc::scoped_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
+ std::unique_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
uint8_t* out = ALIGNP(outbuf.get(), kAlignment);
EXPECT_EQ(out_size, frame.ConvertToRgbBuffer(cricket::FOURCC_ARGB,
@@ -1005,7 +1006,7 @@ class VideoFrameTest : public testing::Test {
}
// Convert back to ARGB
size_t out_size = 10 * 4;
- rtc::scoped_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
+ std::unique_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment]);
uint8_t* out = ALIGNP(outbuf.get(), kAlignment);
EXPECT_EQ(out_size, frame.ConvertToRgbBuffer(cricket::FOURCC_ARGB,
@@ -1030,7 +1031,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a YUY2 buffer with horizontal cropping.
void ConstructYuy2CropHorizontal() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_YUY2, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertYuv422(ms.get(), cricket::FOURCC_YUY2, kWidth, kHeight,
@@ -1044,7 +1045,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from an ARGB buffer with horizontal cropping.
void ConstructARGBCropHorizontal() {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateRgbSample(cricket::FOURCC_ARGB, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_ARGB, kWidth, kHeight,
@@ -1134,7 +1135,7 @@ class VideoFrameTest : public testing::Test {
int size_adjust,
bool expected_result) {
T frame;
- rtc::scoped_ptr<rtc::MemoryStream> ms(LoadSample(name));
+ std::unique_ptr<rtc::MemoryStream> ms(LoadSample(name));
ASSERT_TRUE(ms.get() != NULL);
const uint8_t* sample =
reinterpret_cast<const uint8_t*>(ms.get()->GetBuffer());
@@ -1145,7 +1146,7 @@ class VideoFrameTest : public testing::Test {
// Allocate a buffer with end page aligned.
const int kPadToHeapSized = 16 * 1024 * 1024;
- rtc::scoped_ptr<uint8_t[]> page_buffer(
+ std::unique_ptr<uint8_t[]> page_buffer(
new uint8_t[((data_size + kPadToHeapSized + 4095) & ~4095)]);
uint8_t* data_ptr = page_buffer.get();
if (!data_ptr) {
@@ -1251,7 +1252,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a YUY2 buffer (and synonymous formats).
void ConstructYuy2Aliases() {
T frame1, frame2, frame3, frame4;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_YUY2, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertYuv422(ms.get(), cricket::FOURCC_YUY2, kWidth, kHeight,
@@ -1270,7 +1271,7 @@ class VideoFrameTest : public testing::Test {
// Test constructing an image from a UYVY buffer (and synonymous formats).
void ConstructUyvyAliases() {
T frame1, frame2, frame3, frame4;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_UYVY, kWidth, kHeight));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertYuv422(ms.get(), cricket::FOURCC_UYVY, kWidth, kHeight,
@@ -1325,7 +1326,7 @@ class VideoFrameTest : public testing::Test {
T frame1, frame2;
for (int height = kMinHeightAll; height <= kMaxHeightAll; ++height) {
for (int width = kMinWidthAll; width <= kMaxWidthAll; ++width) {
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateYuv422Sample(cricket::FOURCC_YUY2, width, height));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertYuv422(ms.get(), cricket::FOURCC_YUY2, width, height,
@@ -1343,7 +1344,7 @@ class VideoFrameTest : public testing::Test {
T frame1, frame2;
for (int height = kMinHeightAll; height <= kMaxHeightAll; ++height) {
for (int width = kMinWidthAll; width <= kMaxWidthAll; ++width) {
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateRgbSample(cricket::FOURCC_ARGB, width, height));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_ARGB, width, height,
@@ -1358,7 +1359,7 @@ class VideoFrameTest : public testing::Test {
const int kOddHeight = 260;
for (int j = 0; j < 2; ++j) {
for (int i = 0; i < 2; ++i) {
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
CreateRgbSample(cricket::FOURCC_ARGB, kOddWidth + i, kOddHeight + j));
ASSERT_TRUE(ms.get() != NULL);
EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_ARGB,
@@ -1374,7 +1375,7 @@ class VideoFrameTest : public testing::Test {
// Tests re-initing an existing image.
void Reset(webrtc::VideoRotation rotation, bool apply_rotation) {
T frame1, frame2;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
LoadSample(kImageFilename));
ASSERT_TRUE(ms.get() != NULL);
size_t data_size;
@@ -1442,7 +1443,7 @@ class VideoFrameTest : public testing::Test {
int astride = kWidth * bpp + rowpad;
size_t out_size = astride * kHeight;
- rtc::scoped_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment + 1]);
+ std::unique_ptr<uint8_t[]> outbuf(new uint8_t[out_size + kAlignment + 1]);
memset(outbuf.get(), 0, out_size + kAlignment + 1);
uint8_t* outtop = ALIGNP(outbuf.get(), kAlignment);
uint8_t* out = outtop;
@@ -1760,7 +1761,7 @@ class VideoFrameTest : public testing::Test {
void ConvertToI422Buffer() {
T frame1, frame2;
size_t out_size = kWidth * kHeight * 2;
- rtc::scoped_ptr<uint8_t[]> buf(new uint8_t[out_size + kAlignment]);
+ std::unique_ptr<uint8_t[]> buf(new uint8_t[out_size + kAlignment]);
uint8_t* y = ALIGNP(buf.get(), kAlignment);
uint8_t* u = y + kWidth * kHeight;
uint8_t* v = u + (kWidth / 2) * kHeight;
@@ -1785,8 +1786,8 @@ class VideoFrameTest : public testing::Test {
///////////////////
void Copy() {
- rtc::scoped_ptr<T> source(new T);
- rtc::scoped_ptr<cricket::VideoFrame> target;
+ std::unique_ptr<T> source(new T);
+ std::unique_ptr<cricket::VideoFrame> target;
ASSERT_TRUE(LoadFrameNoRepeat(source.get()));
target.reset(source->Copy());
EXPECT_TRUE(IsEqual(*source, *target, 0));
@@ -1795,8 +1796,8 @@ class VideoFrameTest : public testing::Test {
}
void CopyIsRef() {
- rtc::scoped_ptr<T> source(new T);
- rtc::scoped_ptr<const cricket::VideoFrame> target;
+ std::unique_ptr<T> source(new T);
+ std::unique_ptr<const cricket::VideoFrame> target;
ASSERT_TRUE(LoadFrameNoRepeat(source.get()));
target.reset(source->Copy());
EXPECT_TRUE(IsEqual(*source, *target, 0));
@@ -1807,8 +1808,8 @@ class VideoFrameTest : public testing::Test {
}
void MakeExclusive() {
- rtc::scoped_ptr<T> source(new T);
- rtc::scoped_ptr<cricket::VideoFrame> target;
+ std::unique_ptr<T> source(new T);
+ std::unique_ptr<cricket::VideoFrame> target;
ASSERT_TRUE(LoadFrameNoRepeat(source.get()));
target.reset(source->Copy());
EXPECT_TRUE(target->MakeExclusive());
@@ -1820,7 +1821,7 @@ class VideoFrameTest : public testing::Test {
void CopyToFrame() {
T source;
- rtc::scoped_ptr<rtc::MemoryStream> ms(
+ std::unique_ptr<rtc::MemoryStream> ms(
LoadSample(kImageFilename));
ASSERT_TRUE(ms.get() != NULL);
ASSERT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_I420, kWidth, kHeight,
« no previous file with comments | « webrtc/media/base/videoengine_unittest.h ('k') | webrtc/media/base/videoframefactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698