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

Issue 2534553002: Replace VideoCaptureDataCallback by VideoSinkInterface. (Closed)

Created:
4 years ago by nisse-webrtc
Modified:
4 years ago
CC:
webrtc-reviews_webrtc.org, zhengzhonghou_agora.io, tterriberry_mozilla.com, sdk-team_agora.io, the sun, mflodman
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Replace VideoCaptureDataCallback by VideoSinkInterface. This also deletes unused features of the video_capturer interface, the classes VideoCaptureFeedBack, VideoCaptureEncodeInterface and related methods, and the module id which used to be passed as an argument to the VideoCaptureDataCallback. In theory the module id could have been used to let a single VideoCaptureDataCallback serve several capturers, and demultiplex on the id, but in practice, it was unused. With this change, it is required to use a separate VideoSinkInterface for each capturer. BUG=webrtc:6789 Committed: https://crrev.com/b29b9c8e49934e4b9435f8c482bd0bbacdf8f350 Cr-Commit-Position: refs/heads/master@{#15540}

Patch Set 1 #

Patch Set 2 : First attempt to fix objc and windows builds. #

Patch Set 3 : Drop capture id in more places for windows and objc. #

Patch Set 4 : Drop capture id in more places for windows and objc, again. #

Patch Set 5 : Drop capture id in more places for windows. #

Patch Set 6 : Purge module id also from DeviceInfo. #

Patch Set 7 : Drop capture id in more places for windows and objc, again. #

Patch Set 8 : Drop capture for windows CreateDeviceInfo. #

Patch Set 9 : Update declaration of windows DeviceInfoMF. #

Patch Set 10 : Rebase. #

Patch Set 11 : Add webrtc/media/base to video_capturer include_rules. #

Total comments: 6

Patch Set 12 : Drop inheritance of RefCountedModule. Drop tests of capture delay. #

Total comments: 1

Patch Set 13 : Break overlong lines. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+225 lines, -606 lines) Patch
M webrtc/examples/peerconnection/client/conductor.cc View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M webrtc/media/engine/fakewebrtcvcmfactory.h View 1 2 3 4 5 1 chunk +2 lines, -4 lines 0 comments Download
M webrtc/media/engine/fakewebrtcvideocapturemodule.h View 1 2 3 4 5 6 7 8 9 10 11 4 chunks +6 lines, -33 lines 0 comments Download
M webrtc/media/engine/webrtcvideocapturer.h View 1 2 3 4 5 2 chunks +3 lines, -7 lines 0 comments Download
M webrtc/media/engine/webrtcvideocapturer.cc View 1 2 3 4 5 6 chunks +8 lines, -15 lines 0 comments Download
M webrtc/media/engine/webrtcvideocapturer_unittest.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M webrtc/modules/video_capture/DEPS View 1 2 3 4 5 6 7 8 9 10 1 chunk +1 line, -0 lines 0 comments Download
M webrtc/modules/video_capture/device_info_impl.h View 1 2 3 4 5 2 chunks +1 line, -2 lines 0 comments Download
M webrtc/modules/video_capture/device_info_impl.cc View 1 2 3 4 5 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/modules/video_capture/external/device_info_external.cc View 1 2 3 4 5 2 chunks +3 lines, -6 lines 0 comments Download
M webrtc/modules/video_capture/external/video_capture_external.cc View 1 chunk +1 line, -2 lines 0 comments Download
M webrtc/modules/video_capture/linux/device_info_linux.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M webrtc/modules/video_capture/linux/device_info_linux.cc View 1 2 3 4 5 6 7 8 9 10 11 12 11 chunks +23 lines, -17 lines 0 comments Download
M webrtc/modules/video_capture/linux/video_capture_linux.h View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/modules/video_capture/linux/video_capture_linux.cc View 15 chunks +19 lines, -19 lines 0 comments Download
M webrtc/modules/video_capture/objc/device_info.h View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M webrtc/modules/video_capture/objc/device_info.mm View 1 2 3 4 5 6 1 chunk +4 lines, -6 lines 0 comments Download
M webrtc/modules/video_capture/objc/rtc_video_capture_objc.h View 1 2 1 chunk +1 line, -2 lines 0 comments Download
M webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm View 1 2 5 chunks +4 lines, -6 lines 0 comments Download
M webrtc/modules/video_capture/objc/video_capture.h View 1 2 2 chunks +1 line, -3 lines 0 comments Download
M webrtc/modules/video_capture/objc/video_capture.mm View 1 2 3 3 chunks +5 lines, -8 lines 0 comments Download
M webrtc/modules/video_capture/test/video_capture_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 chunks +9 lines, -116 lines 0 comments Download
M webrtc/modules/video_capture/video_capture.h View 1 2 3 4 5 6 7 8 9 10 11 4 chunks +3 lines, -42 lines 0 comments Download
M webrtc/modules/video_capture/video_capture_defines.h View 2 chunks +0 lines, -29 lines 0 comments Download
M webrtc/modules/video_capture/video_capture_factory.h View 1 2 3 4 5 1 chunk +1 line, -4 lines 0 comments Download
M webrtc/modules/video_capture/video_capture_factory.cc View 1 2 3 4 5 1 chunk +4 lines, -7 lines 0 comments Download
M webrtc/modules/video_capture/video_capture_impl.h View 1 2 3 4 5 6 7 8 9 10 11 4 chunks +19 lines, -42 lines 0 comments Download
M webrtc/modules/video_capture/video_capture_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 7 chunks +6 lines, -125 lines 0 comments Download
M webrtc/modules/video_capture/windows/device_info_ds.h View 1 2 3 4 5 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/modules/video_capture/windows/device_info_ds.cc View 1 2 3 4 5 6 7 8 9 10 11 12 26 chunks +34 lines, -30 lines 0 comments Download
M webrtc/modules/video_capture/windows/device_info_mf.h View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M webrtc/modules/video_capture/windows/device_info_mf.cc View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M webrtc/modules/video_capture/windows/sink_filter_ds.h View 1 2 3 4 3 chunks +2 lines, -7 lines 0 comments Download
M webrtc/modules/video_capture/windows/sink_filter_ds.cc View 1 2 3 4 7 chunks +8 lines, -12 lines 0 comments Download
M webrtc/modules/video_capture/windows/video_capture_ds.h View 1 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/modules/video_capture/windows/video_capture_ds.cc View 1 2 3 4 18 chunks +27 lines, -27 lines 0 comments Download
M webrtc/modules/video_capture/windows/video_capture_factory_windows.cc View 1 2 3 4 5 6 7 1 chunk +4 lines, -6 lines 0 comments Download
M webrtc/modules/video_capture/windows/video_capture_mf.h View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/modules/video_capture/windows/video_capture_mf.cc View 1 2 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/test/vcm_capturer.h View 2 chunks +4 lines, -4 lines 0 comments Download
M webrtc/test/vcm_capturer.cc View 1 2 3 4 5 3 chunks +4 lines, -7 lines 0 comments Download

Messages

Total messages: 38 (11 generated)
nisse-webrtc
PTAL. This breaks presubmit because of a banned include of webrtc/media/base/videosinkinterface.h Not sure how to ...
4 years ago (2016-11-28 15:01:06 UTC) #2
kjellander_webrtc
Will the removal of the ID make it harder/impossible to use more than one capture ...
4 years ago (2016-11-29 07:56:26 UTC) #3
nisse-webrtc
On 2016/11/29 07:56:26, kjellander_webrtc wrote: > Will the removal of the ID make it harder/impossible ...
4 years ago (2016-11-29 08:07:08 UTC) #4
kjellander_webrtc
On 2016/11/29 08:07:08, nisse-webrtc wrote: > On 2016/11/29 07:56:26, kjellander_webrtc wrote: > > Will the ...
4 years ago (2016-11-29 08:31:07 UTC) #5
nisse-webrtc
Updated description, and fixed presubmit error (still a few warnings on long lines, which I'll ...
4 years ago (2016-11-29 08:57:31 UTC) #7
kjellander_webrtc
On 2016/11/29 08:57:31, nisse-webrtc wrote: > Updated description, and fixed presubmit error (still a few ...
4 years ago (2016-11-29 08:59:55 UTC) #8
nisse-webrtc
On 2016/11/29 08:59:55, kjellander_webrtc wrote: > On 2016/11/29 08:57:31, nisse-webrtc wrote: > > Updated description, ...
4 years ago (2016-11-29 09:51:15 UTC) #10
kjellander_webrtc
lgtm but please weigh Per's review higher since he knows this code better (I don't).
4 years ago (2016-11-29 09:58:14 UTC) #11
perkj_webrtc
looks good. But if you do this much cleaning I would like you to do ...
4 years ago (2016-11-29 12:55:56 UTC) #12
nisse-webrtc
Done. What about VideoCaptureCapability, is that used for anything? Tests give a bunch of warnings, ...
4 years ago (2016-11-29 13:58:17 UTC) #13
perkj_webrtc
Isnt VideoCaptureCapabilities used for enumerating what formats a camera supports. https://codereview.webrtc.org/2534553002/diff/200001/webrtc/modules/video_capture/video_capture_impl.cc File webrtc/modules/video_capture/video_capture_impl.cc (right): https://codereview.webrtc.org/2534553002/diff/200001/webrtc/modules/video_capture/video_capture_impl.cc#newcode92 ...
4 years ago (2016-11-30 06:28:49 UTC) #14
nisse-webrtc
https://codereview.webrtc.org/2534553002/diff/200001/webrtc/modules/video_capture/video_capture_impl.cc File webrtc/modules/video_capture/video_capture_impl.cc (right): https://codereview.webrtc.org/2534553002/diff/200001/webrtc/modules/video_capture/video_capture_impl.cc#newcode92 webrtc/modules/video_capture/video_capture_impl.cc:92: void VideoCaptureImpl::Process() On 2016/11/30 06:28:48, perkj_webrtc wrote: > On ...
4 years ago (2016-11-30 07:54:01 UTC) #15
perkj_webrtc
On 2016/11/30 07:54:01, nisse-webrtc wrote: > https://codereview.webrtc.org/2534553002/diff/200001/webrtc/modules/video_capture/video_capture_impl.cc > File webrtc/modules/video_capture/video_capture_impl.cc (right): > > https://codereview.webrtc.org/2534553002/diff/200001/webrtc/modules/video_capture/video_capture_impl.cc#newcode92 > ...
4 years ago (2016-11-30 19:00:34 UTC) #16
nisse-webrtc
https://codereview.webrtc.org/2534553002/diff/220001/webrtc/media/engine/fakewebrtcvcmfactory.h File webrtc/media/engine/fakewebrtcvcmfactory.h (right): https://codereview.webrtc.org/2534553002/diff/220001/webrtc/media/engine/fakewebrtcvcmfactory.h#newcode30 webrtc/media/engine/fakewebrtcvcmfactory.h:30: return module; This piece of code really wants reference ...
4 years ago (2016-12-01 14:21:13 UTC) #17
perkj_webrtc
On 2016/12/01 14:21:13, nisse-webrtc wrote: > https://codereview.webrtc.org/2534553002/diff/220001/webrtc/media/engine/fakewebrtcvcmfactory.h > File webrtc/media/engine/fakewebrtcvcmfactory.h (right): > > https://codereview.webrtc.org/2534553002/diff/220001/webrtc/media/engine/fakewebrtcvcmfactory.h#newcode30 > ...
4 years ago (2016-12-01 14:32:04 UTC) #18
perkj_webrtc
lgtm but please test that peerconnection_client works on windows and linux and video_loopback on win ...
4 years ago (2016-12-01 14:35:13 UTC) #19
nisse-webrtc
On 2016/12/01 14:32:04, perkj_webrtc wrote: > On 2016/12/01 14:21:13, nisse-webrtc wrote: > > > https://codereview.webrtc.org/2534553002/diff/220001/webrtc/media/engine/fakewebrtcvcmfactory.h ...
4 years ago (2016-12-01 14:42:23 UTC) #20
nisse-webrtc
On 2016/12/01 14:35:13, perkj_webrtc wrote: > lgtm but please test that peerconnection_client works on windows ...
4 years ago (2016-12-05 15:13:17 UTC) #21
nisse-webrtc
On 2016/12/05 15:13:17, nisse-webrtc wrote: > On 2016/12/01 14:35:13, perkj_webrtc wrote: > > lgtm but ...
4 years ago (2016-12-08 12:57:30 UTC) #22
kjellander_webrtc
Sorry for not responding to this, I've been behind on e-mail. On 2016/12/08 12:57:30, nisse-webrtc ...
4 years ago (2016-12-08 14:32:50 UTC) #23
nisse-webrtc
On 2016/12/08 14:32:50, kjellander_webrtc wrote: > Sorry for not responding to this, I've been behind ...
4 years ago (2016-12-09 08:42:28 UTC) #24
nisse-webrtc
On 2016/12/08 14:32:50, kjellander_webrtc wrote: > > On 2016/12/08 12:57:30, nisse-webrtc wrote: > > Who ...
4 years ago (2016-12-12 07:35:22 UTC) #25
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/2534553002/220001
4 years ago (2016-12-12 07:35:48 UTC) #28
commit-bot: I haz the power
Try jobs failed on following builders: presubmit on master.tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/11309)
4 years ago (2016-12-12 07:41:17 UTC) #30
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/2534553002/240001
4 years ago (2016-12-12 08:05:55 UTC) #33
commit-bot: I haz the power
Committed patchset #13 (id:240001)
4 years ago (2016-12-12 08:23:01 UTC) #36
commit-bot: I haz the power
4 years ago (2016-12-12 08:23:10 UTC) #38
Message was sent while issue was closed.
Patchset 13 (id:??) landed as
https://crrev.com/b29b9c8e49934e4b9435f8c482bd0bbacdf8f350
Cr-Commit-Position: refs/heads/master@{#15540}

Powered by Google App Engine
This is Rietveld 408576698