2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
|
|
Date: Thu, 18 Oct 2018 17:07:01 -0700
|
|
|
|
Subject: desktop_media_list.patch
|
|
|
|
|
2019-10-18 19:57:34 +00:00
|
|
|
* Expose the capturer source list for the desktopCapturer API
|
|
|
|
* Free the one-time use capturer after thumbnails are fetched
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-03 12:26:42 +00:00
|
|
|
diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
|
2019-10-28 22:12:35 +00:00
|
|
|
index a489bf6ea2179059f53e53563e993db9c7cd123b..93e237569fe94ec8526f67d915e1a7352d586b16 100644
|
2018-10-03 12:26:42 +00:00
|
|
|
--- a/chrome/browser/media/webrtc/desktop_media_list.h
|
|
|
|
+++ b/chrome/browser/media/webrtc/desktop_media_list.h
|
2019-10-28 22:12:35 +00:00
|
|
|
@@ -38,6 +38,9 @@ class DesktopMediaList {
|
|
|
|
|
|
|
|
virtual ~DesktopMediaList() {}
|
|
|
|
|
|
|
|
+ // Allows listening to notifications generated by the model.
|
|
|
|
+ virtual void AddObserver(DesktopMediaListObserver* observer) = 0;
|
|
|
|
+
|
|
|
|
// Sets time interval between updates. By default list of sources and their
|
|
|
|
// thumbnail are updated once per second. If called after StartUpdating() then
|
|
|
|
// it will take effect only after the next update.
|
|
|
|
@@ -69,6 +72,7 @@ class DesktopMediaList {
|
2018-10-03 12:26:42 +00:00
|
|
|
|
|
|
|
virtual int GetSourceCount() const = 0;
|
|
|
|
virtual const Source& GetSource(int index) const = 0;
|
|
|
|
+ virtual const std::vector<Source>& GetSources() const = 0;
|
|
|
|
|
|
|
|
virtual content::DesktopMediaID::Type GetMediaListType() const = 0;
|
|
|
|
};
|
|
|
|
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.cc b/chrome/browser/media/webrtc/desktop_media_list_base.cc
|
2020-06-01 20:34:34 +00:00
|
|
|
index 147d5be9f7f56fb71468b56e86eb33b59d51cd66..5930fe95e33a9e5a3108c31e8c34daa9c724511c 100644
|
2018-10-03 12:26:42 +00:00
|
|
|
--- a/chrome/browser/media/webrtc/desktop_media_list_base.cc
|
|
|
|
+++ b/chrome/browser/media/webrtc/desktop_media_list_base.cc
|
2020-06-01 20:34:34 +00:00
|
|
|
@@ -20,6 +20,11 @@ DesktopMediaListBase::DesktopMediaListBase(base::TimeDelta update_period)
|
2019-10-28 22:12:35 +00:00
|
|
|
|
|
|
|
DesktopMediaListBase::~DesktopMediaListBase() {}
|
|
|
|
|
|
|
|
+void DesktopMediaListBase::AddObserver(DesktopMediaListObserver* observer) {
|
|
|
|
+ DCHECK(!observer_);
|
|
|
|
+ observer_ = observer;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
void DesktopMediaListBase::SetUpdatePeriod(base::TimeDelta period) {
|
|
|
|
DCHECK(!observer_);
|
|
|
|
update_period_ = period;
|
2020-06-01 20:34:34 +00:00
|
|
|
@@ -54,7 +59,7 @@ void DesktopMediaListBase::Update(UpdateCallback callback) {
|
2019-10-18 19:57:34 +00:00
|
|
|
DCHECK(sources_.empty());
|
|
|
|
DCHECK(!refresh_callback_);
|
|
|
|
refresh_callback_ = std::move(callback);
|
|
|
|
- Refresh(false);
|
|
|
|
+ Refresh(true);
|
2018-10-03 12:26:42 +00:00
|
|
|
}
|
|
|
|
|
2019-10-18 19:57:34 +00:00
|
|
|
int DesktopMediaListBase::GetSourceCount() const {
|
2020-06-01 20:34:34 +00:00
|
|
|
@@ -68,6 +73,11 @@ const DesktopMediaList::Source& DesktopMediaListBase::GetSource(
|
2018-10-03 12:26:42 +00:00
|
|
|
return sources_[index];
|
|
|
|
}
|
|
|
|
|
|
|
|
+const std::vector<DesktopMediaList::Source>& DesktopMediaListBase::GetSources()
|
|
|
|
+ const {
|
|
|
|
+ return sources_;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
DesktopMediaID::Type DesktopMediaListBase::GetMediaListType() const {
|
|
|
|
return type_;
|
|
|
|
}
|
2020-06-01 20:34:34 +00:00
|
|
|
@@ -79,6 +89,12 @@ DesktopMediaListBase::SourceDescription::SourceDescription(
|
2019-10-28 22:12:35 +00:00
|
|
|
|
|
|
|
void DesktopMediaListBase::UpdateSourcesList(
|
|
|
|
const std::vector<SourceDescription>& new_sources) {
|
|
|
|
+ // Notify observer when there was no new source captured.
|
|
|
|
+ if (new_sources.empty()) {
|
|
|
|
+ observer_->OnSourceUnchanged(this);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
typedef std::set<DesktopMediaID> SourceSet;
|
|
|
|
SourceSet new_source_set;
|
|
|
|
for (size_t i = 0; i < new_sources.size(); ++i) {
|
2018-10-03 12:26:42 +00:00
|
|
|
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
|
2019-10-28 22:12:35 +00:00
|
|
|
index 3c09ec3111d54cb4f0b74f16a81292b779009eae..5c3667822afd47a22878b508b844a615c24f3162 100644
|
2018-10-03 12:26:42 +00:00
|
|
|
--- a/chrome/browser/media/webrtc/desktop_media_list_base.h
|
|
|
|
+++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
|
2019-10-28 22:12:35 +00:00
|
|
|
@@ -27,6 +27,7 @@ class DesktopMediaListBase : public DesktopMediaList {
|
|
|
|
~DesktopMediaListBase() override;
|
|
|
|
|
|
|
|
// DesktopMediaList interface.
|
|
|
|
+ void AddObserver(DesktopMediaListObserver* observer) override;
|
|
|
|
void SetUpdatePeriod(base::TimeDelta period) override;
|
|
|
|
void SetThumbnailSize(const gfx::Size& thumbnail_size) override;
|
|
|
|
void SetViewDialogWindowId(content::DesktopMediaID dialog_id) override;
|
|
|
|
@@ -34,6 +35,7 @@ class DesktopMediaListBase : public DesktopMediaList {
|
2019-10-18 19:57:34 +00:00
|
|
|
void Update(UpdateCallback callback) override;
|
2018-10-03 12:26:42 +00:00
|
|
|
int GetSourceCount() const override;
|
|
|
|
const Source& GetSource(int index) const override;
|
|
|
|
+ const std::vector<Source>& GetSources() const override;
|
|
|
|
content::DesktopMediaID::Type GetMediaListType() const override;
|
|
|
|
|
|
|
|
static uint32_t GetImageHash(const gfx::Image& image);
|
2019-10-28 22:12:35 +00:00
|
|
|
diff --git a/chrome/browser/media/webrtc/desktop_media_list_observer.h b/chrome/browser/media/webrtc/desktop_media_list_observer.h
|
|
|
|
index ad7f766a36b1b6b2a8bc0f96369f1aaadf6681f7..f6c6c14a0937430df62c9b9c1132c5916a9f2009 100644
|
|
|
|
--- a/chrome/browser/media/webrtc/desktop_media_list_observer.h
|
|
|
|
+++ b/chrome/browser/media/webrtc/desktop_media_list_observer.h
|
|
|
|
@@ -20,6 +20,7 @@ class DesktopMediaListObserver {
|
|
|
|
int new_index) = 0;
|
|
|
|
virtual void OnSourceNameChanged(DesktopMediaList* list, int index) = 0;
|
|
|
|
virtual void OnSourceThumbnailChanged(DesktopMediaList* list, int index) = 0;
|
|
|
|
+ virtual void OnSourceUnchanged(DesktopMediaList* list) = 0;
|
|
|
|
|
|
|
|
protected:
|
|
|
|
virtual ~DesktopMediaListObserver() {}
|
2018-10-03 12:26:42 +00:00
|
|
|
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
|
2020-10-28 00:33:04 +00:00
|
|
|
index 63ee95a80309357293afa0684c2a1cec6a3ba105..a0098e9450b48f03b98008e0e81fe48cc2a7b293 100644
|
2018-10-03 12:26:42 +00:00
|
|
|
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
|
|
|
|
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
|
2020-10-28 00:33:04 +00:00
|
|
|
@@ -10,14 +10,15 @@
|
2019-04-20 17:20:37 +00:00
|
|
|
#include "base/hash/hash.h"
|
2019-08-02 23:56:46 +00:00
|
|
|
#include "base/message_loop/message_pump_type.h"
|
2018-10-24 23:25:48 +00:00
|
|
|
#include "base/single_thread_task_runner.h"
|
2018-10-03 12:26:42 +00:00
|
|
|
+#include "base/strings/string_number_conversions.h"
|
|
|
|
#include "base/strings/utf_string_conversions.h"
|
2018-10-24 23:25:48 +00:00
|
|
|
#include "base/threading/thread_restrictions.h"
|
2020-10-28 00:33:04 +00:00
|
|
|
#include "base/threading/thread_task_runner_handle.h"
|
2018-10-24 23:25:48 +00:00
|
|
|
#include "build/build_config.h"
|
2019-10-18 19:57:34 +00:00
|
|
|
#include "chrome/browser/media/webrtc/desktop_media_list.h"
|
2018-10-03 20:50:07 +00:00
|
|
|
-#include "chrome/grit/generated_resources.h"
|
2019-01-12 01:00:43 +00:00
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
2018-10-03 12:26:42 +00:00
|
|
|
#include "content/public/browser/browser_thread.h"
|
2018-10-03 20:50:07 +00:00
|
|
|
+#include "electron/grit/electron_resources.h"
|
2018-10-03 12:26:42 +00:00
|
|
|
#include "media/base/video_util.h"
|
|
|
|
#include "third_party/libyuv/include/libyuv/scale_argb.h"
|
2018-10-03 20:50:07 +00:00
|
|
|
#include "third_party/skia/include/core/SkBitmap.h"
|
2020-10-28 00:33:04 +00:00
|
|
|
@@ -257,6 +258,8 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
|
2020-06-01 20:34:34 +00:00
|
|
|
FROM_HERE,
|
2019-09-18 20:20:41 +00:00
|
|
|
base::BindOnce(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
|
|
|
|
media_list_));
|
|
|
|
+
|
|
|
|
+ capturer_.reset();
|
|
|
|
}
|
|
|
|
|
2020-10-28 00:33:04 +00:00
|
|
|
void NativeDesktopMediaList::Worker::OnCaptureResult(
|