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

Unified Diff: content/renderer/media/video_capture_impl_unittest.cc

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: format Created 5 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: content/renderer/media/video_capture_impl_unittest.cc
diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc
index 795b1e6e6d1140b67d72acfb7e303d4a6b3e9bd5..261aa5b69cfaacaa25248f0d544e69007eafdd2a 100644
--- a/content/renderer/media/video_capture_impl_unittest.cc
+++ b/content/renderer/media/video_capture_impl_unittest.cc
@@ -47,8 +47,9 @@ struct BufferReceivedTestArg {
static const BufferReceivedTestArg kBufferFormats[] = {
BufferReceivedTestArg(media::PIXEL_FORMAT_I420),
- BufferReceivedTestArg(media::PIXEL_FORMAT_ARGB,
- gpu::MailboxHolder(gpu::Mailbox::Generate(), 0, 0))};
+ BufferReceivedTestArg(
+ media::PIXEL_FORMAT_ARGB,
+ gpu::MailboxHolder(gpu::Mailbox::Generate(), gpu::SyncToken(), 0))};
class VideoCaptureImplTest
: public ::testing::TestWithParam<BufferReceivedTestArg> {
@@ -98,7 +99,7 @@ class VideoCaptureImplTest
void DeviceReceiveEmptyBuffer(int device_id,
int buffer_id,
- uint32 sync_point,
+ const gpu::SyncToken& release_sync_token,
double consumer_resource_utilization) {
received_buffer_count_++;
}
« no previous file with comments | « content/renderer/media/video_capture_impl.cc ('k') | content/renderer/media/video_capture_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698