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

Issue 2582883002: Revert of [Mojo Video Capture] Replace method OnIncomingCapturedVideoFrame with OnIncomingCapturedBufferExt (Closed)

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

Description

Revert of [Mojo Video Capture] Replace method OnIncomingCapturedVideoFrame with OnIncomingCapturedBufferExt (patchset #3 id:80001 of https://codereview.chromium.org/2566983007/ ) Reason for revert: Broke a test in webrtc.peerconnection, see crbug.com/675020 Original issue's description: > [Mojo Video Capture] Replace method OnIncomingCapturedVideoFrame() with OnIncomingCapturedBufferExt() > > In interface media:VideoCaptureDevice::Client, replaced the method > OnIncomingCapturedVideoFrame() with OnIncomingCapturedBufferExt(). Compared to > method OnIncomingCaptureBuffer(), the VideoFrame parameter in > OnIncomingCapturedVideoFrame() was only used for passing along a bit of extra > information, namely a custom |visible_rect| as well as some > |additional_metadata|. The new method makes the intent clear and eliminates the > need for passing a media::VideoFrame that is partly redundant with the also > passed media::VideoCaptureDevice::Client::Buffer. > > This CL breaks the video_capture_unittests, because current implementation of > the video_capture service wants to use VideoCaptureDeviceClient with buffers > that are backed by MojoSharedMemoryBufferTracker instances instead of the "regular" shared memory buffers. With this CL, VideoCaptureDeviceClient is > dropping support for this. We are working towards making the video_capture > service work with the regular buffers. To keep CLs small, we defer changes > to the service to after refactorings of VideoCaptureController and > VideoCaptureManager are complete and deactive the video_capture_unittests > temporarily. This is acceptable for the time being, since they are not run on > the bots yet. The CL that re-enables them is currently labeled CL1.9.22 in the > design doc. > > This CL is part of the Mojo Video Capture work. For the bigger picture, > see [1] CL1.9.9 > > BUG=584797 > TEST= > content_unittests --gtest_filter="*Video*", > video_capture_unittests, > Apprtc loopback on Debug, > Desktop Capture Example extension on Release > > [1] https://docs.google.com/a/chromium.org/document/d/1Qw7rw1AJy0QHXjha36jZNiEuxsxWslJ_X-zpOhijvI8/edit?usp=sharing > > Committed: https://crrev.com/ae6dc27e5d3233ceeb8397debaa745577b3312da > Cr-Commit-Position: refs/heads/master@{#438673} TBR=miu@chromium.org,mcasas@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=584797 Committed: https://crrev.com/6d7035123762737c17d709f17791040bec4ec9b9 Cr-Commit-Position: refs/heads/master@{#439233}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+192 lines, -236 lines) Patch
M content/browser/media/capture/desktop_capture_device_aura_unittest.cc View 1 chunk +2 lines, -6 lines 0 comments Download
M content/browser/media/capture/desktop_capture_device_unittest.cc View 1 chunk +3 lines, -7 lines 0 comments Download
M content/browser/media/capture/screen_capture_device_android_unittest.cc View 1 chunk +2 lines, -6 lines 0 comments Download
M content/browser/media/capture/web_contents_video_capture_device_unittest.cc View 1 chunk +12 lines, -17 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_controller_unittest.cc View 14 chunks +99 lines, -87 lines 0 comments Download
M media/capture/content/thread_safe_capture_oracle.cc View 1 chunk +20 lines, -27 lines 0 comments Download
M media/capture/video/fake_video_capture_device_unittest.cc View 1 chunk +4 lines, -6 lines 0 comments Download
M media/capture/video/linux/v4l2_capture_delegate_unittest.cc View 1 chunk +2 lines, -6 lines 0 comments Download
M media/capture/video/video_capture_device.h View 1 chunk +13 lines, -15 lines 0 comments Download
M media/capture/video/video_capture_device_client.h View 1 chunk +2 lines, -6 lines 0 comments Download
M media/capture/video/video_capture_device_client.cc View 2 chunks +22 lines, -37 lines 0 comments Download
M media/capture/video/video_capture_device_unittest.cc View 1 chunk +2 lines, -7 lines 0 comments Download
M services/video_capture/test/fake_device_descriptor_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M services/video_capture/test/fake_device_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M services/video_capture/test/mock_device_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M services/video_capture/test/service_unittest.cc View 3 chunks +3 lines, -3 lines 0 comments Download

Messages

Total messages: 4 (3 generated)
chfremer
4 years ago (2016-12-16 21:59:23 UTC) #2
Created Revert of [Mojo Video Capture] Replace method
OnIncomingCapturedVideoFrame with OnIncomingCapturedBufferExt

Powered by Google App Engine
This is Rietveld 408576698