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

Unified Diff: webrtc/common_video/i420_video_frame_unittest.cc

Issue 2477233004: Update VideoFrameBuffer-related methods to not use references to scoped_refptr. (Closed)
Patch Set: Created 4 years, 1 month 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
Index: webrtc/common_video/i420_video_frame_unittest.cc
diff --git a/webrtc/common_video/i420_video_frame_unittest.cc b/webrtc/common_video/i420_video_frame_unittest.cc
index 420ae4e152d0225f285de3ded655882c3785de34..88a04825d9c88ca375bc7eb17350187666cb9612 100644
--- a/webrtc/common_video/i420_video_frame_unittest.cc
+++ b/webrtc/common_video/i420_video_frame_unittest.cc
@@ -151,8 +151,10 @@ TEST(TestVideoFrame, ShallowCopy) {
memset(buffer_y, 16, kSizeY);
memset(buffer_u, 8, kSizeU);
memset(buffer_v, 4, kSizeV);
+ // TODO(nisse): This new + Copy looks quite awkward. Consider adding
+ // an alternative I420Buffer::Create method.
VideoFrame frame1(
- I420Buffer::Copy(new rtc::RefCountedObject<webrtc::WrappedI420Buffer>(
+ I420Buffer::Copy(*new rtc::RefCountedObject<webrtc::WrappedI420Buffer>(
width, height,
buffer_y, stride_y,
buffer_u, stride_u,
@@ -211,7 +213,7 @@ TEST(TestI420FrameBuffer, Copy) {
memset(buf1->MutableDataY(), 1, 200);
memset(buf1->MutableDataU(), 2, 50);
memset(buf1->MutableDataV(), 3, 50);
- rtc::scoped_refptr<I420Buffer> buf2 = I420Buffer::Copy(buf1);
+ rtc::scoped_refptr<I420Buffer> buf2 = I420Buffer::Copy(*buf1);
EXPECT_TRUE(test::FrameBufsEqual(buf1, buf2));
}
@@ -222,7 +224,7 @@ TEST(TestI420FrameBuffer, Scale) {
rtc::scoped_refptr<I420Buffer> scaled_buffer(
I420Buffer::Create(150, 75));
- scaled_buffer->ScaleFrom(buf);
+ scaled_buffer->ScaleFrom(*buf);
CheckCrop(*scaled_buffer, 0.0, 0.0, 1.0, 1.0);
}
@@ -233,7 +235,7 @@ TEST(TestI420FrameBuffer, CropXCenter) {
rtc::scoped_refptr<I420Buffer> scaled_buffer(
I420Buffer::Create(100, 100));
- scaled_buffer->CropAndScaleFrom(buf, 50, 0, 100, 100);
+ scaled_buffer->CropAndScaleFrom(*buf, 50, 0, 100, 100);
CheckCrop(*scaled_buffer, 0.25, 0.0, 0.5, 1.0);
}
@@ -244,7 +246,7 @@ TEST(TestI420FrameBuffer, CropXNotCenter) {
rtc::scoped_refptr<I420Buffer> scaled_buffer(
I420Buffer::Create(100, 100));
- scaled_buffer->CropAndScaleFrom(buf, 25, 0, 100, 100);
+ scaled_buffer->CropAndScaleFrom(*buf, 25, 0, 100, 100);
CheckCrop(*scaled_buffer, 0.125, 0.0, 0.5, 1.0);
}
@@ -255,7 +257,7 @@ TEST(TestI420FrameBuffer, CropYCenter) {
rtc::scoped_refptr<I420Buffer> scaled_buffer(
I420Buffer::Create(100, 100));
- scaled_buffer->CropAndScaleFrom(buf, 0, 50, 100, 100);
+ scaled_buffer->CropAndScaleFrom(*buf, 0, 50, 100, 100);
CheckCrop(*scaled_buffer, 0.0, 0.25, 1.0, 0.5);
}
@@ -266,7 +268,7 @@ TEST(TestI420FrameBuffer, CropYNotCenter) {
rtc::scoped_refptr<I420Buffer> scaled_buffer(
I420Buffer::Create(100, 100));
- scaled_buffer->CropAndScaleFrom(buf, 0, 25, 100, 100);
+ scaled_buffer->CropAndScaleFrom(*buf, 0, 25, 100, 100);
CheckCrop(*scaled_buffer, 0.0, 0.125, 1.0, 0.5);
}
@@ -277,7 +279,7 @@ TEST(TestI420FrameBuffer, CropAndScale16x9) {
rtc::scoped_refptr<I420Buffer> scaled_buffer(
I420Buffer::Create(320, 180));
- scaled_buffer->CropAndScaleFrom(buf);
+ scaled_buffer->CropAndScaleFrom(*buf);
CheckCrop(*scaled_buffer, 0.0, 0.125, 1.0, 0.75);
}
« no previous file with comments | « no previous file | webrtc/common_video/include/video_frame_buffer.h » ('j') | webrtc/common_video/include/video_frame_buffer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698