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

webrtc/modules/video_capture/windows/video_capture_ds.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 377 matching lines @@
     {
         WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id,
                      "Failed to connect capture device to the dv devoder: %x",
                      hr);
         return hr;
     }
 
     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");
         }
         else
         {
             WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id,
                          "Failed to connect capture device to the send graph: 0x%x",
                          hr);
         }
         return hr;
     }
     return hr;
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc