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

Unified Diff: webrtc/media/engine/webrtcvideoengine2_unittest.cc

Issue 2278883002: Move MutableDataY{,U,V} methods to I420Buffer only. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 3 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
Index: webrtc/media/engine/webrtcvideoengine2_unittest.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
index 26b13ed3986d819110aaa1032458f6ea594bc672..2840dedd2806a78734d83e66c4b35776a7167d72 100644
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
@@ -66,17 +66,13 @@ void VerifyCodecHasDefaultFeedbackParams(const cricket::VideoCodec& codec) {
cricket::kRtcpFbParamCcm, cricket::kRtcpFbCcmParamFir)));
}
-static void CreateBlackFrame(webrtc::VideoFrame* video_frame,
- int width,
- int height) {
- video_frame->CreateEmptyFrame(
- width, height, width, (width + 1) / 2, (width + 1) / 2);
- memset(video_frame->video_frame_buffer()->MutableDataY(), 16,
- video_frame->allocated_size(webrtc::kYPlane));
- memset(video_frame->video_frame_buffer()->MutableDataU(), 128,
- video_frame->allocated_size(webrtc::kUPlane));
- memset(video_frame->video_frame_buffer()->MutableDataV(), 128,
- video_frame->allocated_size(webrtc::kVPlane));
+static rtc::scoped_refptr<webrtc::VideoFrameBuffer> CreateBlackFrameBuffer(
+ int width,
+ int height) {
+ rtc::scoped_refptr<webrtc::I420Buffer> buffer =
+ webrtc::I420Buffer::Create(width, height);
+ buffer->SetToBlack();
+ return buffer;
}
void VerifySendStreamHasRtxTypes(const webrtc::VideoSendStream::Config& config,
@@ -2276,9 +2272,9 @@ TEST_F(WebRtcVideoChannel2Test, EstimatesNtpStartTimeCorrectly) {
cricket::FakeVideoRenderer renderer;
EXPECT_TRUE(channel_->SetSink(last_ssrc_, &renderer));
- webrtc::VideoFrame video_frame;
- CreateBlackFrame(&video_frame, 4, 4);
- video_frame.set_timestamp(kInitialTimestamp);
+ webrtc::VideoFrame video_frame(CreateBlackFrameBuffer(4, 4),
+ kInitialTimestamp, 0,
+ webrtc::kVideoRotation_0);
// Initial NTP time is not available on the first frame, but should still be
// able to be estimated.
stream->InjectFrame(video_frame);

Powered by Google App Engine
This is Rietveld 408576698