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

Issue 84393002: Revert 236927 "Reorganize media::VideoCapture* types" (Closed)

Created:
7 years, 1 month ago by scottmg
Modified:
7 years, 1 month ago
Reviewers:
sheu
CC:
chromium-reviews
Visibility:
Public.

Description

Revert 236927 "Reorganize media::VideoCapture* types" Failing compile on win and win x64 FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma\gomacc.exe "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\amd64\cl.exe" /nologo /showIncludes /FC @obj\media\video\capture\win\media.capability_list_win.obj.rsp /c ..\..\media\video\capture\win\capability_list_win.cc /Foobj\media\video\capture\win\media.capability_list_win.obj /Fdobj\media\media.pdb c:\b\build\slave\cr-win-rel-x64\build\src\media\video\capture\win\capability_list_win.h(54) :error C4430: missing type specifier - int assumed. Note: C++ does not support default-int c:\b\build\slave\cr-win-rel-x64\build\src\media\video\capture\win\capability_list_win.h(54) : warning C4183: 'DISALLOW_COPY_AND_ASSIGN': missing return type; assumed to be a member function returning 'int' ninja: build stopped: subcommand failed. > 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 > > Review URL: https://codereview.chromium.org/68503005 TBR=sheu@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=236935

Patch Set 1 #

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

Messages

Total messages: 3 (0 generated)
scottmg
7 years, 1 month ago (2013-11-23 04:10:51 UTC) #1
scottmg
7 years, 1 month ago (2013-11-23 04:10:52 UTC) #2
scottmg
7 years, 1 month ago (2013-11-23 04:11:18 UTC) #3
Message was sent while issue was closed.
Committed patchset #1 manually as r236935.

Powered by Google App Engine
This is Rietveld 408576698