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

Unified Diff: content/browser/renderer_host/media/video_capture_host_unittest.cc

Issue 312803002: Android media: VideoFrame should not store so many sync points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ios build Created 6 years, 5 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/browser/renderer_host/media/video_capture_host_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index 1df72ba0b9c856f103fee3409bbfb0d4ae1d6f05..69f6712227d1e5d04b8f591507eee0d5af472c8b 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -152,7 +152,7 @@ class MockVideoCaptureHost : public VideoCaptureHost {
void ReturnReceivedDibs(int device_id) {
int handle = GetReceivedDib();
while (handle) {
- this->OnReceiveEmptyBuffer(device_id, handle, std::vector<uint32>());
+ this->OnReceiveEmptyBuffer(device_id, handle, 0);
handle = GetReceivedDib();
}
}
@@ -240,8 +240,7 @@ class MockVideoCaptureHost : public VideoCaptureHost {
OnBufferFilled(device_id, buffer_id, frame_format, timestamp);
if (return_buffers_) {
- VideoCaptureHost::OnReceiveEmptyBuffer(
- device_id, buffer_id, std::vector<uint32>());
+ VideoCaptureHost::OnReceiveEmptyBuffer(device_id, buffer_id, 0);
}
}
@@ -253,8 +252,7 @@ class MockVideoCaptureHost : public VideoCaptureHost {
OnMailboxBufferFilled(
device_id, buffer_id, mailbox_holder, format, timestamp);
if (return_buffers_) {
- VideoCaptureHost::OnReceiveEmptyBuffer(
- device_id, buffer_id, std::vector<uint32>());
+ VideoCaptureHost::OnReceiveEmptyBuffer(device_id, buffer_id, 0);
}
}

Powered by Google App Engine
This is Rietveld 408576698