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

Unified Diff: content/common/gpu/media/video_encode_accelerator_unittest.cc

Issue 1476523005: Verify returned frames from media::VideoFrame::Wrap*() methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mcasas@ comments. Created 4 years, 11 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: content/common/gpu/media/video_encode_accelerator_unittest.cc
diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc
index fe3668699f3676cae6ae5d5a5eeb5158e0849ad3..dfecb5b8b7a58068b4f5bf2c4447b0e326ee73e9 100644
--- a/content/common/gpu/media/video_encode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc
@@ -1321,14 +1321,18 @@ scoped_refptr<media::VideoFrame> VEAClient::CreateFrame(off_t position) {
uint8_t* frame_data_v = frame_data_u + test_stream_->aligned_plane_size[1];
CHECK_GT(current_framerate_, 0U);
- return media::VideoFrame::WrapExternalYuvData(
- kInputFormat, input_coded_size_, gfx::Rect(test_stream_->visible_size),
- test_stream_->visible_size, input_coded_size_.width(),
- input_coded_size_.width() / 2, input_coded_size_.width() / 2,
- frame_data_y, frame_data_u, frame_data_v,
- base::TimeDelta().FromMilliseconds(next_input_id_ *
- base::Time::kMillisecondsPerSecond /
- current_framerate_));
+ scoped_refptr<media::VideoFrame> video_frame =
+ media::VideoFrame::WrapExternalYuvData(
+ kInputFormat, input_coded_size_,
+ gfx::Rect(test_stream_->visible_size), test_stream_->visible_size,
+ input_coded_size_.width(), input_coded_size_.width() / 2,
+ input_coded_size_.width() / 2, frame_data_y, frame_data_u,
+ frame_data_v,
+ base::TimeDelta().FromMilliseconds(
+ next_input_id_ * base::Time::kMillisecondsPerSecond /
+ current_framerate_));
+ EXPECT_NE(nullptr, video_frame.get());
+ return video_frame;
}
scoped_refptr<media::VideoFrame> VEAClient::PrepareInputFrame(
@@ -1338,6 +1342,7 @@ scoped_refptr<media::VideoFrame> VEAClient::PrepareInputFrame(
test_stream_->mapped_aligned_in_file.length());
scoped_refptr<media::VideoFrame> frame = CreateFrame(position);
+ EXPECT_NE(nullptr, frame.get());
frame->AddDestructionObserver(
media::BindToCurrentLoop(
base::Bind(&VEAClient::InputNoLongerNeededCallback,

Powered by Google App Engine
This is Rietveld 408576698