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

Unified Diff: media/capture/video/fake_video_capture_device_unittest.cc

Issue 2518143004: [Mojo Video Capture] Replace RESOURCE_UTILIZATION with interface ReceiverLoadObserver (Closed)
Patch Set: Fixes for failing bots 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: media/capture/video/fake_video_capture_device_unittest.cc
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc
index 5b6fe3ad1befce19093f1ee82adb9cb48bb948cb..3c5338306b7407cd6e90a1555ac8b9e0c1f67e41 100644
--- a/media/capture/video/fake_video_capture_device_unittest.cc
+++ b/media/capture/video/fake_video_capture_device_unittest.cc
@@ -76,14 +76,15 @@ class MockClient : public VideoCaptureDevice::Client {
const VideoCaptureFormat& format,
int rotation,
base::TimeTicks reference_time,
- base::TimeDelta timestamp) override {
+ base::TimeDelta timestamp,
+ int frame_id) override {
frame_cb_.Run(format);
}
// Virtual methods for capturing using Client's Buffers.
std::unique_ptr<Buffer> ReserveOutputBuffer(
const gfx::Size& dimensions,
media::VideoPixelFormat format,
- media::VideoPixelStorage storage) {
+ media::VideoPixelStorage storage) override {
EXPECT_TRUE((format == media::PIXEL_FORMAT_ARGB &&
storage == media::PIXEL_STORAGE_CPU));
EXPECT_GT(dimensions.GetArea(), 0);
@@ -91,13 +92,15 @@ class MockClient : public VideoCaptureDevice::Client {
return base::MakeUnique<MockBuffer>(0, frame_format.ImageAllocationSize());
}
void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
- const VideoCaptureFormat& frame_format,
+ const VideoCaptureFormat& format,
base::TimeTicks reference_time,
- base::TimeDelta timestamp) {
- frame_cb_.Run(frame_format);
+ base::TimeDelta timestamp,
+ int frame_id) override {
+ frame_cb_.Run(format);
}
void OnIncomingCapturedVideoFrame(std::unique_ptr<Buffer> buffer,
- scoped_refptr<media::VideoFrame> frame) {
+ scoped_refptr<media::VideoFrame> frame,
+ int frame_id) override {
VideoCaptureFormat format(frame->natural_size(), 30.0,
PIXEL_FORMAT_I420);
frame_cb_.Run(format);
@@ -105,7 +108,7 @@ class MockClient : public VideoCaptureDevice::Client {
std::unique_ptr<Buffer> ResurrectLastOutputBuffer(
const gfx::Size& dimensions,
media::VideoPixelFormat format,
- media::VideoPixelStorage storage) {
+ media::VideoPixelStorage storage) override {
return std::unique_ptr<Buffer>();
}
double GetBufferPoolUtilization() const override { return 0.0; }

Powered by Google App Engine
This is Rietveld 408576698