mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
b588353543
* Introduce a FullScreenWindowDetector to manage routines for updating the list of sources being application agnostic, inspired by FullScreenChromeWindowDetector. * Introduce a FullScreenApplicationHandler to make a decision about changing window to share in application specific way, inspired by FullScreenChromeWindowDetector. * Remove FullScreenChromeWindowDetector as redundant. * Add FullScreenApplicationHandler for MS PowerPoint and Apple Keynote on MacOS. * Add FullScreenApplicationHandler for MS PowerPoint on Windows. Bug: webrtc:3852 Change-Id: I06507d929308e85b882b2f8210a025afef7f26a9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/156020 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Jamie Walch <jamiewalch@chromium.org> Reviewed-by: Justin Uberti <juberti@webrtc.org> Reviewed-by: Wez <wez@google.com> Cr-Commit-Position: refs/heads/master@{#29993}
84 lines
2.7 KiB
C++
84 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2019 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 "modules/desktop_capture/full_screen_window_detector.h"
|
|
#include "modules/desktop_capture/full_screen_application_handler.h"
|
|
#include "rtc_base/time_utils.h"
|
|
|
|
namespace webrtc {
|
|
|
|
FullScreenWindowDetector::FullScreenWindowDetector(
|
|
ApplicationHandlerFactory application_handler_factory)
|
|
: application_handler_factory_(application_handler_factory),
|
|
last_update_time_ms_(0),
|
|
previous_source_id_(0),
|
|
no_handler_source_id_(0) {}
|
|
|
|
DesktopCapturer::SourceId FullScreenWindowDetector::FindFullScreenWindow(
|
|
DesktopCapturer::SourceId original_source_id) {
|
|
if (app_handler_ == nullptr ||
|
|
app_handler_->GetSourceId() != original_source_id) {
|
|
return 0;
|
|
}
|
|
return app_handler_->FindFullScreenWindow(window_list_, last_update_time_ms_);
|
|
}
|
|
|
|
void FullScreenWindowDetector::UpdateWindowListIfNeeded(
|
|
DesktopCapturer::SourceId original_source_id,
|
|
rtc::FunctionView<bool(DesktopCapturer::SourceList*)> get_sources) {
|
|
const bool skip_update = previous_source_id_ != original_source_id;
|
|
previous_source_id_ = original_source_id;
|
|
|
|
// Here is an attempt to avoid redundant creating application handler in case
|
|
// when an instance of WindowCapturer is used to generate a thumbnail to show
|
|
// in picker by calling SelectSource and CaptureFrame for every available
|
|
// source.
|
|
if (skip_update) {
|
|
return;
|
|
}
|
|
|
|
CreateApplicationHandlerIfNeeded(original_source_id);
|
|
if (app_handler_ == nullptr) {
|
|
// There is no FullScreenApplicationHandler specific for
|
|
// current application
|
|
return;
|
|
}
|
|
|
|
constexpr int64_t kUpdateIntervalMs = 500;
|
|
|
|
if ((rtc::TimeMillis() - last_update_time_ms_) <= kUpdateIntervalMs) {
|
|
return;
|
|
}
|
|
|
|
DesktopCapturer::SourceList window_list;
|
|
if (get_sources(&window_list)) {
|
|
last_update_time_ms_ = rtc::TimeMillis();
|
|
window_list_.swap(window_list);
|
|
}
|
|
}
|
|
|
|
void FullScreenWindowDetector::CreateApplicationHandlerIfNeeded(
|
|
DesktopCapturer::SourceId source_id) {
|
|
if (no_handler_source_id_ == source_id) {
|
|
return;
|
|
}
|
|
|
|
if (app_handler_ == nullptr || app_handler_->GetSourceId() != source_id) {
|
|
app_handler_ = application_handler_factory_
|
|
? application_handler_factory_(source_id)
|
|
: nullptr;
|
|
}
|
|
|
|
if (app_handler_ == nullptr) {
|
|
no_handler_source_id_ = source_id;
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|