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

Side by Side Diff: media/capture/video/linux/v4l2_capture_delegate_unittest.cc

Issue 2566983007: [Mojo Video Capture] Replace method OnIncomingCapturedVideoFrame with OnIncomingCapturedBufferExt (Closed)
Patch Set: mcasas comments 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <sys/fcntl.h> 5 #include <sys/fcntl.h>
6 #include <sys/ioctl.h> 6 #include <sys/ioctl.h>
7 7
8 #include "base/files/file_enumerator.h" 8 #include "base/files/file_enumerator.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 media::VideoPixelFormat, 163 media::VideoPixelFormat,
164 media::VideoPixelStorage, 164 media::VideoPixelStorage,
165 int)); 165 int));
166 void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer, 166 void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
167 const VideoCaptureFormat& frame_format, 167 const VideoCaptureFormat& frame_format,
168 base::TimeTicks reference_time, 168 base::TimeTicks reference_time,
169 base::TimeDelta timestamp) override { 169 base::TimeDelta timestamp) override {
170 DoOnIncomingCapturedBuffer(); 170 DoOnIncomingCapturedBuffer();
171 } 171 }
172 MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void)); 172 MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
173 void OnIncomingCapturedVideoFrame( 173 void OnIncomingCapturedBufferExt(
174 std::unique_ptr<Buffer> buffer, 174 std::unique_ptr<Buffer> buffer,
175 scoped_refptr<media::VideoFrame> frame) override { 175 const VideoCaptureFormat& format,
176 base::TimeTicks reference_time,
177 base::TimeDelta timestamp,
178 gfx::Rect visible_rect,
179 const VideoFrameMetadata& additional_metadata) override {
176 DoOnIncomingCapturedVideoFrame(); 180 DoOnIncomingCapturedVideoFrame();
177 } 181 }
178 MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void)); 182 MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
179 MOCK_METHOD4(ResurrectLastOutputBuffer, 183 MOCK_METHOD4(ResurrectLastOutputBuffer,
180 std::unique_ptr<Buffer>(const gfx::Size&, 184 std::unique_ptr<Buffer>(const gfx::Size&,
181 VideoPixelFormat, 185 VideoPixelFormat,
182 VideoPixelStorage, 186 VideoPixelStorage,
183 int)); 187 int));
184 MOCK_METHOD2(OnError, 188 MOCK_METHOD2(OnError,
185 void(const tracked_objects::Location& from_here, 189 void(const tracked_objects::Location& from_here,
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 // their |default_value|s. 252 // their |default_value|s.
249 { 253 {
250 base::ScopedFD device_fd( 254 base::ScopedFD device_fd(
251 HANDLE_EINTR(open(device_descriptor_.device_id.c_str(), O_RDWR))); 255 HANDLE_EINTR(open(device_descriptor_.device_id.c_str(), O_RDWR)));
252 ASSERT_TRUE(device_fd.is_valid()); 256 ASSERT_TRUE(device_fd.is_valid());
253 VerifyUserControlsAreSetToDefaultValues(device_fd.get()); 257 VerifyUserControlsAreSetToDefaultValues(device_fd.get());
254 } 258 }
255 } 259 }
256 260
257 }; // namespace media 261 }; // namespace media
OLDNEW
« no previous file with comments | « media/capture/video/fake_video_capture_device_unittest.cc ('k') | media/capture/video/video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698