|
Reland [Mojo Video Capture] Adapt video_capture service to refactored video capture stack
PatchSet #1 is the state as previously reviewed and reverted.
PatchSet #2 fixes the reason for the revert.
Description of Fix:
The test "AccessIsRevokedOnSecondAccess" was flaky because had an incorrect
expectation on the order in which events from the service arrive. This is fixed
by removing this expectation.
Original CL description:
This CL is part of the Mojo Video Capture work. For the bigger picture,
see [1] CL22b.
Note: The video capture service implementation is currently in an incomplete and
outdated state and its tests are disabled. With the refactoring of the legacy
video capture stack now being complete, the next goal is to update the service
implementation and fit it into the refactored stack.
Changes in this CL:
* Update Mojo interfaces to more closely resemble their native counterparts.
- video_capture.mojom.Device offers functionality similar to
VideoCaptureDeviceLauncher + LaunchedVideoCaptureDevice.
- video_capture.mojom.DeviceFactory offers functionality similar to
media::VideoCaptureProvider.
- video_capture.mojom.Receiver offers functionality similar to
media::VideoFrameReceiver.
* In the service implementation, use a VideoCaptureSystem instead of a
VideoCaptureDeviceFactory directly.
* Add new adapter classes for plumbing between Mojo service and its usage in
the native code.
* Re-enable existing video_capture_unittests and add a few more.
BUG= 584797
TEST=
service_unittests --gtest_filter="*Video*"
content_unittests --gtest_filter="*Video*"
content_browsertests --gtest_filter="VideoCaptureBrowserTest.*"
TBR=emircan@chromium.org,ochang@chromium.org
[1] https://docs.google.com/a/chromium.org/document/d/1Qw7rw1AJy0QHXjha36jZNiEuxsxWslJ_X-zpOhijvI8/edit?usp=sharing
Review-Url: https://codereview.chromium.org/2843333006
Cr-Commit-Position: refs/heads/master@{#468024}
Committed: https://chromium.googlesource.com/chromium/src/+/c79ffd81351cd9ade16c129ff4e7728e7275dfac
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+638 lines, -174 lines) |
Patch |
 |
M |
media/capture/BUILD.gn
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/capture/video/fake_video_capture_device_unittest.cc
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
A |
media/capture/video/shared_memory_buffer_handle.h
|
View
|
|
1 chunk |
+37 lines, -0 lines |
0 comments
|
Download
|
 |
A |
media/capture/video/shared_memory_buffer_handle.cc
|
View
|
|
1 chunk |
+31 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/capture/video/shared_memory_buffer_tracker.h
|
View
|
|
2 chunks |
+1 line, -20 lines |
0 comments
|
Download
|
 |
M |
media/capture/video/shared_memory_buffer_tracker.cc
|
View
|
|
3 chunks |
+3 lines, -19 lines |
0 comments
|
Download
|
 |
M |
media/capture/video/video_capture_buffer_handle.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/BUILD.gn
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/device_factory_media_to_mojo_adapter.h
|
View
|
|
3 chunks |
+7 lines, -12 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/device_factory_media_to_mojo_adapter.cc
|
View
|
|
4 chunks |
+53 lines, -26 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/device_media_to_mojo_adapter.h
|
View
|
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/device_media_to_mojo_adapter.cc
|
View
|
|
4 chunks |
+23 lines, -4 lines |
0 comments
|
Download
|
 |
A |
services/video_capture/public/cpp/device_to_feedback_observer_adapter.h
|
View
|
|
1 chunk |
+30 lines, -0 lines |
0 comments
|
Download
|
 |
A |
services/video_capture/public/cpp/device_to_feedback_observer_adapter.cc
|
View
|
|
1 chunk |
+20 lines, -0 lines |
0 comments
|
Download
|
 |
A |
services/video_capture/public/cpp/receiver_media_to_mojo_adapter.h
|
View
|
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
A |
services/video_capture/public/cpp/receiver_media_to_mojo_adapter.cc
|
View
|
|
1 chunk |
+112 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/public/interfaces/device.mojom
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/public/interfaces/receiver.mojom
|
View
|
|
1 chunk |
+10 lines, -2 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/receiver_mojo_to_media_adapter.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
services/video_capture/receiver_mojo_to_media_adapter.cc
|
View
|
|
4 chunks |
+37 lines, -8 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/service_impl.cc
|
View
|
|
2 chunks |
+9 lines, -3 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/test/fake_device_descriptor_unittest.cc
|
View
|
1
|
4 chunks |
+15 lines, -11 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/test/fake_device_unittest.cc
|
View
|
|
6 chunks |
+62 lines, -27 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/test/mock_device_factory.cc
|
View
|
|
2 chunks |
+6 lines, -1 line |
0 comments
|
Download
|
 |
M |
services/video_capture/test/mock_device_test.h
|
View
|
|
2 chunks |
+12 lines, -1 line |
0 comments
|
Download
|
 |
M |
services/video_capture/test/mock_device_test.cc
|
View
|
|
4 chunks |
+35 lines, -1 line |
0 comments
|
Download
|
 |
M |
services/video_capture/test/mock_device_unittest.cc
|
View
|
|
3 chunks |
+43 lines, -22 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/test/mock_receiver.h
|
View
|
|
1 chunk |
+17 lines, -5 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/test/mock_receiver.cc
|
View
|
|
1 chunk |
+13 lines, -3 lines |
0 comments
|
Download
|
 |
M |
services/video_capture/test/service_unittest.cc
|
View
|
|
4 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
Dependent Patchsets:
Total messages: 12 (9 generated)
|