Roll chromium_revision 7a4fb8d..f527e86 (370025:370073)

webrtc/modules/video_capture/windows/video_capture_ds.cc

Index: webrtc/modules/video_capture/windows/video_capture_ds.cc
diff --git a/webrtc/modules/video_capture/windows/video_capture_ds.cc b/webrtc/modules/video_capture/windows/video_capture_ds.cc
index b69e50121d1a6da896b999f0e9d2e2817d6a7994..dcef2d4706b0b8d0fb6093e5b3fcb56d8d654847 100644
--- a/webrtc/modules/video_capture/windows/video_capture_ds.cc
+++ b/webrtc/modules/video_capture/windows/video_capture_ds.cc
@@ -395,7 +395,7 @@ HRESULT VideoCaptureDS::ConnectDVCamera()
     hr = _graphBuilder->ConnectDirect(_outputDvPin, _inputSendPin, NULL);
     if (hr != S_OK)
     {
-        if (hr == 0x80070004)
+        if (hr == (long)0x80070004)

[henrika_webrtc, 2016/01/19 08:55:17]

Could you use a suffix here, like 0x80070004L?

[kjellander_webrtc, 2016/01/19 09:18:21]

I tried, but it becomes an unsigned long even if
https://msdn.microsoft.com/en-us/library/00a1awxf.aspx says that the L suffix
should produce a signed long.
Maybe that's a bug in the Windows Clang compiler?

Since _graphBuilder->ConnectDirect returns a signed long I was out of options.
It seemed risky to cast that long to be unsigned...

[henrika_webrtc, 2016/01/19 09:24:14]

never mind, but L or l should be long (see
http://en.cppreference.com/w/cpp/language/integer_literal)

[torbjorng (webrtc), 2016/01/19 13:10:02]

My understanding is that on systems where "long" is a 32-bit type the constant
0x80070004L is promoted to "unsigned long" as "long" does not fit the constant.

If that promoted constant is then used in a context of wider type (64 bits) it
will be zero extended to that width.

Note that (long)0x80070004 is undefined when long is < 33 bits as it will yield
a signed overflow.  :-(

[kjellander_webrtc, 2016/01/19 13:48:58]

Thanks for the input. Tommi suggested a better solution which was implemented in
https://codereview.webrtc.org/1608893003/.

         {
             WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id,
                          "Failed to connect the capture device, busy");