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

Issue 2802553002: Revert of [Mojo Video Capture] Introduce abstraction VideoCaptureSystem (Closed)

Created:
3 years, 8 months ago by tasak
Modified:
3 years, 8 months ago
Reviewers:
emircan, mcasas, miu, chfremer
CC:
chromium-reviews, posciak+watch_chromium.org, chfremer+watch_chromium.org, jam, feature-media-reviews_chromium.org, darin-cc_chromium.org, xjz+watch_chromium.org, miu+watch_chromium.org
Target Ref:
refs/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of [Mojo Video Capture] Introduce abstraction VideoCaptureSystem (patchset #6 id:160001 of https://codereview.chromium.org/2769543002/ ) Reason for revert: I think, this patch makes MediaDevicesDispatcherHostTest.GetVideoInputCapabilities (Win7 Tests) flaky. e.g. https://uberchromegw.corp.google.com/i/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/58802 MediaDevicesDispatcherHostTest.GetVideoInputCapabilities (run #1): [ RUN ] MediaDevicesDispatcherHostTest.GetVideoInputCapabilities c:\b\c\b\win\src\content\browser\renderer_host\media\media_devices_dispatcher_host_unittest.cc(373): error: Actual function call count doesn't match EXPECT_CALL(*this, MockVideoInputCapabilitiesCallback())... Expected: to be called once Actual: never called - unsatisfied and active [ FAILED ] MediaDevicesDispatcherHostTest.GetVideoInputCapabilities (48 ms) Original issue's description: > [Mojo Video Capture] Introduce abstraction VideoCaptureSystem > > This CL is supposed to be a pure refactoring. There should be no changes to > existing behavior. > > This is part of a series of CLs with the goal of separating the class > VideoCaptureManager from knowledge of things that are going to be private > implementation details of the video capture service. The end goal is to have > VideoCaptureManager talk to an abstraction that can be implemented by either the > video capture Mojo service or the existing (legacy) in-process implementation. > > Changes in this CL: > * Move nested struct VideoCaptureManager::DeviceInfo to struct > media::VideoCaptureDeviceInfo. > * Create abstraction VideoCaptureSystem and move caching of > VideoCaptureDeviceInfo to there. This allows us to use this functionality in > both InProcess and MojoService code paths. > * Simplify BuildableDeviceCallbacks interface. With the mapping from device_id > to descriptor being moved into VideoCaptureSystem, BuildableDeviceCallbacks no > longer needs to offer a LookupDeviceDescriptor() method. > > This CL is part of the Mojo Video Capture work. For the bigger picture, > see [1] CL18. > > BUG=584797 > TEST= > content_unittests --gtest_filter="*Video*" > content_browsertests --gtest_filter="VideoCaptureBrowserTest.*" > > [1] https://docs.google.com/a/chromium.org/document/d/1Qw7rw1AJy0QHXjha36jZNiEuxsxWslJ_X-zpOhijvI8/edit?usp=sharing > > Review-Url: https://codereview.chromium.org/2769543002 > Cr-Commit-Position: refs/heads/master@{#461845} > Committed: https://chromium.googlesource.com/chromium/src/+/8d8a5d278461d098d3481acf52275bb931f834f3 TBR=miu@chromium.org,emircan@chromium.org,mcasas@chromium.org,chfremer@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=584797 Review-Url: https://codereview.chromium.org/2802553002 Cr-Commit-Position: refs/heads/master@{#461952} Committed: https://chromium.googlesource.com/chromium/src/+/377d975f2cad5c02157f2436c6d7cf2318c82a51

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+241 lines, -336 lines) Patch
M content/browser/renderer_host/media/buildable_video_capture_device.h View 1 chunk +5 lines, -1 line 0 comments Download
M content/browser/renderer_host/media/in_process_buildable_video_capture_device.h View 4 chunks +4 lines, -4 lines 0 comments Download
M content/browser/renderer_host/media/in_process_buildable_video_capture_device.cc View 7 chunks +45 lines, -17 lines 0 comments Download
M content/browser/renderer_host/media/media_devices_manager_unittest.cc View 1 chunk +2 lines, -3 lines 0 comments Download
M content/browser/renderer_host/media/media_stream_manager.cc View 2 chunks +7 lines, -6 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_manager.h View 7 chunks +28 lines, -16 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_manager.cc View 13 chunks +144 lines, -42 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_manager_unittest.cc View 2 chunks +6 lines, -8 lines 0 comments Download
M media/capture/BUILD.gn View 1 chunk +0 lines, -4 lines 0 comments Download
M media/capture/video/video_capture_device_factory.h View 1 chunk +0 lines, -2 lines 0 comments Download
D media/capture/video/video_capture_device_info.h View 1 chunk +0 lines, -28 lines 0 comments Download
D media/capture/video/video_capture_device_info.cc View 1 chunk +0 lines, -23 lines 0 comments Download
D media/capture/video/video_capture_system.h View 1 chunk +0 lines, -56 lines 0 comments Download
D media/capture/video/video_capture_system.cc View 1 chunk +0 lines, -126 lines 0 comments Download

Messages

Total messages: 6 (3 generated)
tasak
Created Revert of [Mojo Video Capture] Introduce abstraction VideoCaptureSystem
3 years, 8 months ago (2017-04-05 02:44:42 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2802553002/1
3 years, 8 months ago (2017-04-05 02:45:22 UTC) #3
commit-bot: I haz the power
3 years, 8 months ago (2017-04-05 02:47:32 UTC) #6
Message was sent while issue was closed.
Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/377d975f2cad5c02157f2436c6d7...

Powered by Google App Engine
This is Rietveld 408576698