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

Issue 68503005: Reorganize media::VideoCapture* types (Closed)

Created:
7 years, 1 month ago by sheu
Modified:
7 years, 1 month ago
CC:
chromium-reviews, fischman+watch_chromium.org, jam, joi+watch-content_chromium.org, feature-media-reviews_chromium.org, darin-cc_chromium.org, piman+watch_chromium.org, wjia+watch_chromium.org, miu+watch_chromium.org, Pawel Osciak, hshi1
Visibility:
Public.

Description

Reorganize media::VideoCapture* types The purpose of this CL is to clean up the distinction between VideoCaptureFormat (which identifies the captured type of a frame), VideoCaptureParams (which identifies the requested format of a capture), and VideoCaptureCapability (which identifies the capture capabilities of a device). Notably: * VideoCaptureFormat::frame_size_type -> VideoCaptureParams::allow_resolution_change, as variable resolution capability is a per-session, not a per-frame property. * VideoCaptureCapability::color -> VideoCaptureFormat::pixel_format, as frame color format is a per-frame property. * As VideoCaptureParams holds a VideoCaptureFormat member, capture requests are able now to request a particular capture color format. BUG=269312 TEST=local build, run unittests, chrome on CrOS snow, desktop Linux Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=236927

Patch Set 1 : f0961f7e Initial. #

Patch Set 2 : a7375761 Rebase. #

Total comments: 12

Patch Set 3 : f8e7368d Removed session_id from VideoCaptureParams #

Patch Set 4 : 51b76b9a Rebase, comments. Review this please. #

Total comments: 1

Patch Set 5 : 53662152 IPC fix. #

Patch Set 6 : b6e401ee Remove gratuitous change to media/base/video_frame\.cc #

Patch Set 7 : 29374e12 More Windows bits. #

Total comments: 4

Patch Set 8 : 69cea7f8 IPC validation. #

Patch Set 9 : 999eac5e Removed DLOG(INFO) #

Unified diffs Side-by-side diffs Delta from patch set Stats (+743 lines, -811 lines) Patch
M content/browser/renderer_host/media/desktop_capture_device.h View 1 chunk +2 lines, -3 lines 0 comments Download
M content/browser/renderer_host/media/desktop_capture_device.cc View 1 9 chunks +29 lines, -36 lines 0 comments Download
M content/browser/renderer_host/media/desktop_capture_device_unittest.cc View 8 chunks +41 lines, -39 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_controller.h View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_controller.cc View 1 2 12 chunks +32 lines, -34 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_controller_unittest.cc View 1 2 10 chunks +56 lines, -48 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_host.h View 1 2 1 chunk +6 lines, -5 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_host.cc View 1 2 1 chunk +20 lines, -13 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_host_unittest.cc View 1 2 4 chunks +12 lines, -14 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_manager.h View 1 2 3 chunks +4 lines, -3 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_manager.cc View 1 2 3 chunks +18 lines, -25 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_manager_unittest.cc View 1 2 1 chunk +9 lines, -4 lines 0 comments Download
M content/browser/renderer_host/media/web_contents_video_capture_device.h View 1 chunk +2 lines, -3 lines 0 comments Download
M content/browser/renderer_host/media/web_contents_video_capture_device.cc View 6 chunks +18 lines, -24 lines 0 comments Download
M content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc View 1 2 10 chunks +50 lines, -65 lines 0 comments Download
M content/common/media/media_param_traits.cc View 1 2 3 4 2 chunks +10 lines, -11 lines 0 comments Download
M content/common/media/video_capture_messages.h View 1 2 3 4 2 chunks +7 lines, -4 lines 0 comments Download
M content/renderer/media/rtc_video_capture_delegate.cc View 1 chunk +1 line, -0 lines 0 comments Download
M content/renderer/media/rtc_video_capturer.cc View 2 chunks +5 lines, -5 lines 0 comments Download
M content/renderer/media/video_capture_impl.cc View 1 2 7 chunks +21 lines, -23 lines 0 comments Download
M content/renderer/media/video_capture_impl_unittest.cc View 1 2 2 chunks +3 lines, -2 lines 0 comments Download
M content/renderer/media/video_capture_message_filter_unittest.cc View 2 chunks +9 lines, -8 lines 0 comments Download
M content/renderer/pepper/pepper_video_capture_host.cc View 1 chunk +5 lines, -5 lines 0 comments Download
M media/video/capture/android/video_capture_device_android.h View 2 chunks +3 lines, -4 lines 0 comments Download
M media/video/capture/android/video_capture_device_android.cc View 4 chunks +24 lines, -30 lines 0 comments Download
M media/video/capture/fake_video_capture_device.h View 2 chunks +7 lines, -7 lines 0 comments Download
M media/video/capture/fake_video_capture_device.cc View 1 7 chunks +49 lines, -64 lines 0 comments Download
M media/video/capture/linux/video_capture_device_linux.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/video/capture/linux/video_capture_device_linux.cc View 7 chunks +20 lines, -18 lines 0 comments Download
M media/video/capture/mac/video_capture_device_mac.h View 3 chunks +5 lines, -5 lines 0 comments Download
M media/video/capture/mac/video_capture_device_mac.mm View 8 chunks +32 lines, -34 lines 0 comments Download
M media/video/capture/mac/video_capture_device_qtkit_mac.mm View 2 chunks +5 lines, -6 lines 0 comments Download
M media/video/capture/video_capture_device.h View 3 chunks +6 lines, -7 lines 0 comments Download
M media/video/capture/video_capture_device_unittest.cc View 18 chunks +86 lines, -96 lines 0 comments Download
M media/video/capture/video_capture_proxy.cc View 1 chunk +1 line, -0 lines 0 comments Download
M media/video/capture/video_capture_types.h View 1 2 3 3 chunks +22 lines, -22 lines 0 comments Download
M media/video/capture/video_capture_types.cc View 1 2 3 4 5 6 7 1 chunk +16 lines, -32 lines 0 comments Download
M media/video/capture/win/capability_list_win.h View 3 chunks +5 lines, -3 lines 0 comments Download
M media/video/capture/win/capability_list_win.cc View 3 chunks +6 lines, -4 lines 0 comments Download
M media/video/capture/win/sink_filter_win.h View 1 chunk +3 lines, -4 lines 0 comments Download
M media/video/capture/win/sink_filter_win.cc View 1 chunk +4 lines, -5 lines 0 comments Download
M media/video/capture/win/sink_input_pin_win.h View 2 chunks +4 lines, -4 lines 0 comments Download
M media/video/capture/win/sink_input_pin_win.cc View 1 2 3 4 5 5 chunks +27 lines, -33 lines 0 comments Download
M media/video/capture/win/video_capture_device_mf_win.h View 2 chunks +4 lines, -4 lines 0 comments Download
M media/video/capture/win/video_capture_device_mf_win.cc View 1 2 3 4 5 6 7 8 6 chunks +13 lines, -17 lines 0 comments Download
M media/video/capture/win/video_capture_device_win.h View 2 chunks +4 lines, -4 lines 0 comments Download
M media/video/capture/win/video_capture_device_win.cc View 1 2 3 4 5 6 9 chunks +34 lines, -32 lines 0 comments Download

Messages

Total messages: 28 (0 generated)
sheu
jiayl@, nick@: PTAL. You should probably just look at media/video/capture/video_capture_types.h and comment on that first; ...
7 years, 1 month ago (2013-11-18 23:36:04 UTC) #1
ncarter (slow)
https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h File media/video/capture/video_capture_device.h (right): https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h#newcode176 media/video/capture/video_capture_device.h:176: const VideoCaptureFormat& frame_format) = 0; In my mind, this ...
7 years, 1 month ago (2013-11-19 00:14:23 UTC) #2
sheu
https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h File media/video/capture/video_capture_device.h (right): https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h#newcode176 media/video/capture/video_capture_device.h:176: const VideoCaptureFormat& frame_format) = 0; On 2013/11/19 00:14:23, ncarter ...
7 years, 1 month ago (2013-11-19 00:56:12 UTC) #3
ncarter (slow)
https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h File media/video/capture/video_capture_device.h (right): https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h#newcode176 media/video/capture/video_capture_device.h:176: const VideoCaptureFormat& frame_format) = 0; On 2013/11/19 00:56:13, sheu ...
7 years, 1 month ago (2013-11-19 01:22:41 UTC) #4
sheu
cc += posciak@
7 years, 1 month ago (2013-11-19 01:28:25 UTC) #5
sheu
https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h File media/video/capture/video_capture_device.h (right): https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h#newcode176 media/video/capture/video_capture_device.h:176: const VideoCaptureFormat& frame_format) = 0; On 2013/11/19 01:22:42, ncarter ...
7 years, 1 month ago (2013-11-19 03:26:21 UTC) #6
ncarter (slow)
https://codereview.chromium.org/68503005/diff/130050/media/video/capture/video_capture_device.h File media/video/capture/video_capture_device.h (right): https://codereview.chromium.org/68503005/diff/130050/media/video/capture/video_capture_device.h#newcode176 media/video/capture/video_capture_device.h:176: const VideoCaptureFormat& frame_format) = 0; On 2013/11/19 03:26:22, sheu ...
7 years, 1 month ago (2013-11-19 18:54:23 UTC) #7
jiayl
https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_types.h File media/video/capture/video_capture_types.h (right): https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_types.h#newcode34 media/video/capture/video_capture_types.h:34: class MEDIA_EXPORT VideoCaptureFormat { Could you add more documentation ...
7 years, 1 month ago (2013-11-19 19:42:46 UTC) #8
sheu
Updated. jiayl@: will add comments next revision. https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h File media/video/capture/video_capture_device.h (right): https://chromiumcodereview.appspot.com/68503005/diff/130050/media/video/capture/video_capture_device.h#newcode214 media/video/capture/video_capture_device.h:214: virtual void ...
7 years, 1 month ago (2013-11-20 20:35:44 UTC) #9
sheu
Hmm. This CL is base on top of https://chromiumcodereview.appspot.com/48113011/, so y'all should probably hold off ...
7 years, 1 month ago (2013-11-20 20:37:36 UTC) #10
sheu
Updated and rebased. PTAL hshi@: adding you to CC just for informational purposes. https://codereview.chromium.org/68503005/diff/130050/media/video/capture/video_capture_types.h File ...
7 years, 1 month ago (2013-11-20 22:36:03 UTC) #11
jiayl
lgtm
7 years, 1 month ago (2013-11-21 19:38:24 UTC) #12
ncarter (slow)
LGTM with one caveat that I think will come up with the security review. https://codereview.chromium.org/68503005/diff/800001/content/common/media/media_param_traits.cc ...
7 years, 1 month ago (2013-11-21 20:15:44 UTC) #13
sheu
Another big one with lots of little bitty refactoring changes. wjia@: PTAL
7 years, 1 month ago (2013-11-21 21:08:47 UTC) #14
wjia(left Chromium)
lgtm. Thanks for cleaning this up!
7 years, 1 month ago (2013-11-22 00:14:43 UTC) #15
sheu
jschuh@ PTAL at content/common/media/video_capture_messages.h for IPC review.
7 years, 1 month ago (2013-11-22 00:27:23 UTC) #16
sheu
yzshen@: PTAL at content/renderer/pepper/pepper_video_capture_host.cc.
7 years, 1 month ago (2013-11-22 00:29:01 UTC) #17
yzshen1
lgtm
7 years, 1 month ago (2013-11-22 00:51:49 UTC) #18
jschuh
https://codereview.chromium.org/68503005/diff/1180003/content/common/media/media_param_traits.cc File content/common/media/media_param_traits.cc (right): https://codereview.chromium.org/68503005/diff/1180003/content/common/media/media_param_traits.cc#newcode69 content/common/media/media_param_traits.cc:69: if (!m->ReadInt(iter, &frame_size_width) || These values need sane upper ...
7 years, 1 month ago (2013-11-22 14:34:05 UTC) #19
ncarter (slow)
https://codereview.chromium.org/68503005/diff/1180003/content/common/media/media_param_traits.cc File content/common/media/media_param_traits.cc (right): https://codereview.chromium.org/68503005/diff/1180003/content/common/media/media_param_traits.cc#newcode69 content/common/media/media_param_traits.cc:69: if (!m->ReadInt(iter, &frame_size_width) || On 2013/11/22 14:34:06, Justin Schuh ...
7 years, 1 month ago (2013-11-22 14:47:42 UTC) #20
ncarter (slow)
7 years, 1 month ago (2013-11-22 14:47:45 UTC) #21
jschuh
https://codereview.chromium.org/68503005/diff/1180003/content/common/media/media_param_traits.cc File content/common/media/media_param_traits.cc (right): https://codereview.chromium.org/68503005/diff/1180003/content/common/media/media_param_traits.cc#newcode69 content/common/media/media_param_traits.cc:69: if (!m->ReadInt(iter, &frame_size_width) || On 2013/11/22 14:47:43, ncarter wrote: ...
7 years, 1 month ago (2013-11-22 14:57:14 UTC) #22
sheu
IPC bits updated. jschuh@: PTAL
7 years, 1 month ago (2013-11-22 19:05:33 UTC) #23
jschuh
The changes in this CL don't seem scary, so lgtm. I need to circle back ...
7 years, 1 month ago (2013-11-22 21:49:03 UTC) #24
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/sheu@chromium.org/68503005/1440001
7 years, 1 month ago (2013-11-22 23:37:53 UTC) #25
commit-bot: I haz the power
Retried try job too often on chromium_presubmit for step(s) presubmit http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_presubmit&number=37767
7 years, 1 month ago (2013-11-22 23:59:55 UTC) #26
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/sheu@chromium.org/68503005/1580001
7 years, 1 month ago (2013-11-23 00:19:31 UTC) #27
commit-bot: I haz the power
7 years, 1 month ago (2013-11-23 02:22:46 UTC) #28
Message was sent while issue was closed.
Change committed as 236927

Powered by Google App Engine
This is Rietveld 408576698