admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing clang-cl warning suppression flags in video_capture.

Browse Source 
After landing https://webrtc-review.googlesource.com/76720 and
https://webrtc-review.googlesource.com/76722 it is possible to remove
clang-cl only warning suppression flags.

These were needed because winsdk_samples was included using include_dirs
(-I) instead of -imsvc (which is similar to -isystem in GCC and clang).

Bug: webrtc:9251
Change-Id: I2bc19f0ba552342c49a29c07e4fb84d439003dfb
Reviewed-on: https://webrtc-review.googlesource.com/76781
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23252}
This commit is contained in:
Mirko Bonadei 2018-05-15 16:13:23 +02:00 committed by Commit Bot
parent 9632112a16
commit d7624f2d90
4 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/video_capture/BUILD.gn
View File

@ -78,26 +78,9 @@ if (!build_with_chromium) {
}
}
config("video_capture_internal_impl_warnings_config") {
if (is_win && is_clang) {
cflags = [
"-Wno-ignored-attributes",
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=6269
# for -Wno-ignored-qualifiers
"-Wno-ignored-qualifiers",
"-Wno-microsoft-extra-qualification",
"-Wno-overloaded-virtual",
"-Wno-reorder",
"-Wno-writable-strings",
]
}
}
if (is_ios || is_mac) {
rtc_source_set("video_capture_internal_impl_objc") {
visibility = [ ":video_capture_internal_impl" ]
configs += [ ":video_capture_internal_impl_warnings_config" ]
deps = [
":video_capture_module",
@ -126,8 +109,6 @@ if (!build_with_chromium) {
}
rtc_source_set("video_capture_internal_impl") {
configs += [ ":video_capture_internal_impl_warnings_config" ]
deps = [
":video_capture_module",
"../../rtc_base:checks",

7
modules/video_capture/windows/sink_filter_ds.cc
View File

@ -327,7 +327,7 @@ HRESULT CaptureInputPin::SetMatchingMediaType(
return S_OK;
}
// ----------------------------------------------------------------------------
CaptureSinkFilter::CaptureSinkFilter(IN TCHAR* tszName,
CaptureSinkFilter::CaptureSinkFilter(const IN TCHAR* tszName,
IN LPUNKNOWN punk,
OUT HRESULT* phr,
VideoCaptureExternal& captureObserver)
@ -335,8 +335,9 @@ CaptureSinkFilter::CaptureSinkFilter(IN TCHAR* tszName,
m_pInput(NULL),
_captureObserver(captureObserver) {
(*phr) = S_OK;
m_pInput = new CaptureInputPin(NAME("VideoCaptureInputPin"), this,
&m_crtFilter, phr, L"VideoCapture");
TCHAR inputPinName[] = L"VideoCaptureInputPin";
m_pInput = new CaptureInputPin(inputPinName, this, &m_crtFilter, phr,
L"VideoCapture");
if (m_pInput == NULL || FAILED(*phr)) {
(*phr) = FAILED(*phr) ? (*phr) : E_OUTOFMEMORY;
goto cleanup;

2
modules/video_capture/windows/sink_filter_ds.h
View File

@ -50,7 +50,7 @@ class CaptureSinkFilter: public CBaseFilter
{
public:
CaptureSinkFilter(IN TCHAR * tszName,
CaptureSinkFilter(const IN TCHAR * tszName,
IN LPUNKNOWN punk,
OUT HRESULT * phr,
VideoCaptureExternal& captureObserver);

2
modules/video_capture/windows/video_capture_ds.h
View File

@ -57,7 +57,7 @@ protected:
int32_t
SetCameraOutput(const VideoCaptureCapability& requestedCapability);
int32_t DisconnectGraph();
HRESULT VideoCaptureDS::ConnectDVCamera();
HRESULT ConnectDVCamera();
DeviceInfoDS _dsInfo;