From d7624f2d90244619fd6e514b81bc3897156d6267 Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@webrtc.org>
Date: Tue, 15 May 2018 16:13:23 +0200
Subject: [PATCH] Removing clang-cl warning suppression flags in video_capture.

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}
---
 modules/video_capture/BUILD.gn                | 19 -------------------
 .../video_capture/windows/sink_filter_ds.cc   |  7 ++++---
 .../video_capture/windows/sink_filter_ds.h    |  2 +-
 .../video_capture/windows/video_capture_ds.h  |  2 +-
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index ae655548e2..9f8ec65ed3 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -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",
diff --git a/modules/video_capture/windows/sink_filter_ds.cc b/modules/video_capture/windows/sink_filter_ds.cc
index 0e03b2b8d1..76d2fa9119 100644
--- a/modules/video_capture/windows/sink_filter_ds.cc
+++ b/modules/video_capture/windows/sink_filter_ds.cc
@@ -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;
diff --git a/modules/video_capture/windows/sink_filter_ds.h b/modules/video_capture/windows/sink_filter_ds.h
index 9bd89ee463..4f620f4b49 100644
--- a/modules/video_capture/windows/sink_filter_ds.h
+++ b/modules/video_capture/windows/sink_filter_ds.h
@@ -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);
diff --git a/modules/video_capture/windows/video_capture_ds.h b/modules/video_capture/windows/video_capture_ds.h
index 54c5f00c65..86fa5892b1 100644
--- a/modules/video_capture/windows/video_capture_ds.h
+++ b/modules/video_capture/windows/video_capture_ds.h
@@ -57,7 +57,7 @@ protected:
     int32_t
         SetCameraOutput(const VideoCaptureCapability& requestedCapability);
     int32_t DisconnectGraph();
-    HRESULT VideoCaptureDS::ConnectDVCamera();
+    HRESULT ConnectDVCamera();
 
     DeviceInfoDS _dsInfo;