Output DeviceName from various windows ScreenCapturer related implementations

webrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
 #include "webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
 
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/logging.h"
 #include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/rtc_base/timeutils.h"
 
 namespace webrtc {
 
 using Microsoft::WRL::ComPtr;
@@ skipping 78 matching lines @@
           (rtc::TimeNanos() - capture_start_time_nanos) /
           rtc::kNumNanosecsPerMillisec);
       frame->set_capturer_id(DesktopCapturerId::kScreenCapturerWinDirectx);
       callback_->OnCaptureResult(Result::SUCCESS, std::move(frame));
       break;
     }
   }
 }
 
 bool ScreenCapturerWinDirectx::GetSourceList(SourceList* sources) {
-  int screen_count = controller_->ScreenCount();
-  for (int i = 0; i < screen_count; i++) {
-    sources->push_back({i});
+  std::vector<std::string> device_names;
+  if (!controller_->GetDeviceNames(&device_names)) {
+    return false;
+  }
+
+  for (int i = 0; i < static_cast<int>(device_names.size()); i++) {

[Do not use (sergeyu), 2017/07/11 18:21:09]

Use size_t for i, then you wouldn't need the cast.

[Hzj_jie, 2017/07/11 19:09:25]

Then we will need to convert from size_t to int in the following line.
sources->push_back({static_cast<intptr_t>(i), device_names[i]});

+    sources->push_back({i, device_names[i]});
   }
   return true;
 }
 
 bool ScreenCapturerWinDirectx::SelectSource(SourceId id) {
   if (id == current_screen_id_) {
     return true;
   }
 
   if (id == kFullDesktopScreenId) {
     current_screen_id_ = id;
     return true;
   }
 
   int screen_count = controller_->ScreenCount();
   if (id >= 0 && id < screen_count) {
     current_screen_id_ = id;
     return true;
   }
   return false;
 }
 
 }  // namespace webrtc