6bfb122cd1
* Add a screen_api_id parameter to the desktopCapturer API. When using the DirectX capturer on Windows, there was previously no way to associate desktopCapturer/getUserMedia and electron.screen API screens. This new parameter provides the association. * Fix non-Windows build. * Fix Mac. * Fix Mac harder. * JS lint * clang-format C++ code. * IWYU * display_id, Linux comment, better test * lint * Fix tests on Linux. * Add display_id documentation.
175 lines
5.9 KiB
C++
175 lines
5.9 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "atom/browser/api/atom_api_desktop_capturer.h"
|
|
|
|
#include <vector>
|
|
|
|
using base::PlatformThreadRef;
|
|
|
|
#include "atom/common/api/atom_api_native_image.h"
|
|
#include "atom/common/native_mate_converters/gfx_converter.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "chrome/browser/media/desktop_media_list.h"
|
|
#include "content/public/browser/desktop_capture.h"
|
|
#include "native_mate/dictionary.h"
|
|
#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
|
|
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
|
|
#if defined(OS_WIN)
|
|
#include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
|
|
#include "ui/display/win/display_info.h"
|
|
#endif // defined(OS_WIN)
|
|
|
|
#include "atom/common/node_includes.h"
|
|
|
|
namespace mate {
|
|
|
|
template <>
|
|
struct Converter<atom::api::DesktopCapturer::Source> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
const atom::api::DesktopCapturer::Source& source) {
|
|
mate::Dictionary dict(isolate, v8::Object::New(isolate));
|
|
content::DesktopMediaID id = source.media_list_source.id;
|
|
dict.Set("name", base::UTF16ToUTF8(source.media_list_source.name));
|
|
dict.Set("id", id.ToString());
|
|
dict.Set("thumbnail",
|
|
atom::api::NativeImage::Create(
|
|
isolate, gfx::Image(source.media_list_source.thumbnail)));
|
|
dict.Set("display_id", source.display_id);
|
|
return ConvertToV8(isolate, dict);
|
|
}
|
|
};
|
|
|
|
} // namespace mate
|
|
|
|
namespace atom {
|
|
|
|
namespace api {
|
|
|
|
DesktopCapturer::DesktopCapturer(v8::Isolate* isolate) {
|
|
Init(isolate);
|
|
}
|
|
|
|
DesktopCapturer::~DesktopCapturer() {
|
|
}
|
|
|
|
void DesktopCapturer::StartHandling(bool capture_window,
|
|
bool capture_screen,
|
|
const gfx::Size& thumbnail_size) {
|
|
webrtc::DesktopCaptureOptions options =
|
|
content::CreateDesktopCaptureOptions();
|
|
#if defined(OS_WIN)
|
|
using_directx_capturer_ = options.allow_directx_capturer();
|
|
#endif // defined(OS_WIN)
|
|
|
|
std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
|
|
capture_screen ? webrtc::DesktopCapturer::CreateScreenCapturer(options)
|
|
: nullptr);
|
|
std::unique_ptr<webrtc::DesktopCapturer> window_capturer(
|
|
capture_window ? webrtc::DesktopCapturer::CreateWindowCapturer(options)
|
|
: nullptr);
|
|
media_list_.reset(new NativeDesktopMediaList(
|
|
std::move(screen_capturer), std::move(window_capturer)));
|
|
|
|
media_list_->SetThumbnailSize(thumbnail_size);
|
|
media_list_->StartUpdating(this);
|
|
}
|
|
|
|
void DesktopCapturer::OnSourceAdded(int index) {
|
|
}
|
|
|
|
void DesktopCapturer::OnSourceRemoved(int index) {
|
|
}
|
|
|
|
void DesktopCapturer::OnSourceMoved(int old_index, int new_index) {
|
|
}
|
|
|
|
void DesktopCapturer::OnSourceNameChanged(int index) {
|
|
}
|
|
|
|
void DesktopCapturer::OnSourceThumbnailChanged(int index) {
|
|
}
|
|
|
|
bool DesktopCapturer::OnRefreshFinished() {
|
|
const auto media_list_sources = media_list_->GetSources();
|
|
std::vector<DesktopCapturer::Source> sources;
|
|
for (const auto& media_list_source : media_list_sources) {
|
|
sources.emplace_back(
|
|
DesktopCapturer::Source{media_list_source, std::string()});
|
|
}
|
|
|
|
#if defined(OS_WIN)
|
|
// Gather the same unique screen IDs used by the electron.screen API in order
|
|
// to provide an association between it and desktopCapturer/getUserMedia.
|
|
// This is only required when using the DirectX capturer, otherwise the IDs
|
|
// across the APIs already match.
|
|
if (using_directx_capturer_) {
|
|
std::vector<std::string> device_names;
|
|
// Crucially, this list of device names will be in the same order as
|
|
// |media_list_sources|.
|
|
webrtc::DxgiDuplicatorController::Instance()->GetDeviceNames(&device_names);
|
|
int device_name_index = 0;
|
|
for (auto& source : sources) {
|
|
if (source.media_list_source.id.type ==
|
|
content::DesktopMediaID::TYPE_SCREEN) {
|
|
const auto& device_name = device_names[device_name_index++];
|
|
std::wstring wide_device_name;
|
|
base::UTF8ToWide(device_name.c_str(), device_name.size(),
|
|
&wide_device_name);
|
|
const int64_t device_id =
|
|
display::win::DisplayInfo::DeviceIdFromDeviceName(
|
|
wide_device_name.c_str());
|
|
source.display_id = base::Int64ToString(device_id);
|
|
}
|
|
}
|
|
}
|
|
#elif defined(OS_MACOSX)
|
|
// On Mac, the IDs across the APIs match.
|
|
for (auto& source : sources) {
|
|
if (source.media_list_source.id.type ==
|
|
content::DesktopMediaID::TYPE_SCREEN) {
|
|
source.display_id =
|
|
base::Int64ToString(source.media_list_source.id.id);
|
|
}
|
|
}
|
|
#endif // defined(OS_WIN)
|
|
// TODO(ajmacd): Add Linux support. The IDs across APIs differ but Chrome only
|
|
// supports capturing the entire desktop on Linux. Revisit this if individual
|
|
// screen support is added.
|
|
|
|
Emit("finished", sources);
|
|
return false;
|
|
}
|
|
|
|
// static
|
|
mate::Handle<DesktopCapturer> DesktopCapturer::Create(v8::Isolate* isolate) {
|
|
return mate::CreateHandle(isolate, new DesktopCapturer(isolate));
|
|
}
|
|
|
|
// static
|
|
void DesktopCapturer::BuildPrototype(
|
|
v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
|
|
prototype->SetClassName(mate::StringToV8(isolate, "DesktopCapturer"));
|
|
mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
|
|
.SetMethod("startHandling", &DesktopCapturer::StartHandling);
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace atom
|
|
|
|
namespace {
|
|
|
|
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context, void* priv) {
|
|
v8::Isolate* isolate = context->GetIsolate();
|
|
mate::Dictionary dict(isolate, exports);
|
|
dict.Set("desktopCapturer", atom::api::DesktopCapturer::Create(isolate));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize);
|