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

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

Issue 2518143004: [Mojo Video Capture] Replace RESOURCE_UTILIZATION with interface ReceiverLoadObserver (Closed)
Patch Set: Fix for android-only code Created 4 years 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
« no previous file with comments | « media/capture/video/video_capture_device_client.cc ('k') | media/capture/video/video_frame_receiver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/video_capture_device_unittest.cc
diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc
index 20e7a06a74fc48f1bf91f9ab916b12e93450d7a8..b3289d212e0e2bdda7250c98aba2345aceab512e 100644
--- a/media/capture/video/video_capture_device_unittest.cc
+++ b/media/capture/video/video_capture_device_unittest.cc
@@ -113,23 +113,24 @@ class MockVideoCaptureClient : public VideoCaptureDevice::Client {
const VideoCaptureFormat& format,
int rotation,
base::TimeTicks reference_time,
- base::TimeDelta timestamp) override {
+ base::TimeDelta timestamp,
+ int frame_feedback_id) override {
ASSERT_GT(length, 0);
ASSERT_TRUE(data);
main_thread_->PostTask(FROM_HERE, base::Bind(frame_cb_, format));
}
// Trampoline methods to workaround GMOCK problems with std::unique_ptr<>.
- std::unique_ptr<Buffer> ReserveOutputBuffer(
- const gfx::Size& dimensions,
- media::VideoPixelFormat format,
- media::VideoPixelStorage storage) override {
+ std::unique_ptr<Buffer> ReserveOutputBuffer(const gfx::Size& dimensions,
+ media::VideoPixelFormat format,
+ media::VideoPixelStorage storage,
+ int frame_feedback_id) override {
DoReserveOutputBuffer();
NOTREACHED() << "This should never be called";
return std::unique_ptr<Buffer>();
}
void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
- const VideoCaptureFormat& frame_format,
+ const VideoCaptureFormat& format,
base::TimeTicks reference_time,
base::TimeDelta timestamp) override {
DoOnIncomingCapturedBuffer();
@@ -141,7 +142,8 @@ class MockVideoCaptureClient : public VideoCaptureDevice::Client {
std::unique_ptr<Buffer> ResurrectLastOutputBuffer(
const gfx::Size& dimensions,
media::VideoPixelFormat format,
- media::VideoPixelStorage storage) {
+ media::VideoPixelStorage storage,
+ int frame_feedback_id) {
DoResurrectLastOutputBuffer();
NOTREACHED() << "This should never be called";
return std::unique_ptr<Buffer>();
« no previous file with comments | « media/capture/video/video_capture_device_client.cc ('k') | media/capture/video/video_frame_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698