Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(920)

Side by Side Diff: chrome/browser/ui/webui/media_router/query_result_manager.cc

Issue 2264153002: [Presentation API] Add support for multiple URLs in PresentationRequest on Media Router UI side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modify MediaRouterDialogControllerAndroid, format Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/media_router/query_result_manager.h" 5 #include "chrome/browser/ui/webui/media_router/query_result_manager.h"
6 6
7 #include <utility>
8
7 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/memory/ptr_util.h"
8 #include "base/stl_util.h" 11 #include "base/stl_util.h"
9 #include "chrome/browser/media/router/media_router.h" 12 #include "chrome/browser/media/router/media_router.h"
10 #include "chrome/browser/media/router/media_sinks_observer.h" 13 #include "chrome/browser/media/router/media_sinks_observer.h"
11 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
12 15
13 namespace media_router { 16 namespace media_router {
14 17
15 // MediaSinkObserver that propagates results back to |result_manager|. 18 // MediaSinkObserver that propagates results back to |result_manager|.
16 // An instance of this class is associated with each registered MediaCastMode. 19 // An instance of this class is associated with each registered MediaSource.
17 class QueryResultManager::CastModeMediaSinksObserver 20 class QueryResultManager::MediaSourceMediaSinksObserver
18 : public MediaSinksObserver { 21 : public MediaSinksObserver {
19 public: 22 public:
20 CastModeMediaSinksObserver(MediaCastMode cast_mode, 23 MediaSourceMediaSinksObserver(MediaCastMode cast_mode,
21 const MediaSource& source, 24 const MediaSource& source,
22 const GURL& origin, 25 const GURL& origin,
23 MediaRouter* router, 26 MediaRouter* router,
24 QueryResultManager* result_manager) 27 QueryResultManager* result_manager)
25 : MediaSinksObserver(router, source, origin), 28 : MediaSinksObserver(router, source, origin),
26 cast_mode_(cast_mode), 29 cast_mode_(cast_mode),
30 source_(source),
27 result_manager_(result_manager) { 31 result_manager_(result_manager) {
28 DCHECK(result_manager); 32 DCHECK(result_manager);
29 } 33 }
30 34
31 ~CastModeMediaSinksObserver() override {} 35 ~MediaSourceMediaSinksObserver() override {}
32 36
33 // MediaSinksObserver 37 // MediaSinksObserver
34 void OnSinksReceived(const std::vector<MediaSink>& result) override { 38 void OnSinksReceived(const std::vector<MediaSink>& result) override {
35 latest_sink_ids_.clear(); 39 latest_sink_ids_.clear();
36 for (const MediaSink& sink : result) { 40 for (const MediaSink& sink : result) {
37 latest_sink_ids_.push_back(sink.id()); 41 latest_sink_ids_.push_back(sink.id());
38 } 42 }
39 result_manager_->UpdateWithSinksQueryResult(cast_mode_, result); 43 result_manager_->SetSinksCompatibleWithSource(cast_mode_, source_, result);
40 result_manager_->NotifyOnResultsUpdated(); 44 result_manager_->NotifyOnResultsUpdated();
41 } 45 }
42 46
43 // Returns the most recent sink IDs that were passed to |OnSinksReceived|. 47 // Returns the most recent sink IDs that were passed to |OnSinksReceived|.
44 void GetLatestSinkIds(std::vector<MediaSink::Id>* sink_ids) const { 48 void GetLatestSinkIds(std::vector<MediaSink::Id>* sink_ids) const {
45 DCHECK(sink_ids); 49 DCHECK(sink_ids);
46 *sink_ids = latest_sink_ids_; 50 *sink_ids = latest_sink_ids_;
47 } 51 }
48 52
49 MediaCastMode cast_mode() const { return cast_mode_; } 53 MediaCastMode cast_mode() const { return cast_mode_; }
50 54
51 private: 55 private:
52 const MediaCastMode cast_mode_; 56 const MediaCastMode cast_mode_;
57 const MediaSource source_;
53 std::vector<MediaSink::Id> latest_sink_ids_; 58 std::vector<MediaSink::Id> latest_sink_ids_;
54 QueryResultManager* const result_manager_; 59 QueryResultManager* const result_manager_;
55 }; 60 };
56 61
57 QueryResultManager::QueryResultManager(MediaRouter* router) : router_(router) { 62 QueryResultManager::QueryResultManager(MediaRouter* router) : router_(router) {
58 DCHECK(router_); 63 DCHECK(router_);
59 } 64 }
60 65
61 QueryResultManager::~QueryResultManager() { 66 QueryResultManager::~QueryResultManager() {
62 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 67 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
63 } 68 }
64 69
65 void QueryResultManager::AddObserver(Observer* observer) { 70 void QueryResultManager::AddObserver(Observer* observer) {
66 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 71 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
67 DCHECK(observer); 72 DCHECK(observer);
68 observers_.AddObserver(observer); 73 observers_.AddObserver(observer);
69 } 74 }
70 75
71 void QueryResultManager::RemoveObserver(Observer* observer) { 76 void QueryResultManager::RemoveObserver(Observer* observer) {
72 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 77 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
73 DCHECK(observer); 78 DCHECK(observer);
74 observers_.RemoveObserver(observer); 79 observers_.RemoveObserver(observer);
75 } 80 }
76 81
77 void QueryResultManager::StartSinksQuery(MediaCastMode cast_mode, 82 void QueryResultManager::SetSourcesForCastMode(
78 const MediaSource& source, 83 MediaCastMode cast_mode,
79 const GURL& origin) { 84 const std::vector<MediaSource>& sources,
85 const GURL& origin) {
80 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 86 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
81 if (source.Empty()) { 87 if (sources.empty()) {
82 LOG(WARNING) << "StartSinksQuery called with empty source for " 88 LOG(WARNING) << "SetSourcesForCastMode called with empty sources for "
89 << cast_mode;
90 return;
91 }
92 if (!AreSourcesValidForCastMode(cast_mode, sources)) {
93 LOG(WARNING) << "SetSourcesForCastMode called with invalid sources for "
83 << cast_mode; 94 << cast_mode;
84 return; 95 return;
85 } 96 }
86 97
87 SetSourceForCastMode(cast_mode, source); 98 RemoveOldSourcesForCastMode(cast_mode, sources);
88 RemoveObserverForCastMode(cast_mode); 99 AddObserversForCastMode(cast_mode, sources, origin);
89 UpdateWithSinksQueryResult(cast_mode, std::vector<MediaSink>()); 100 cast_mode_sources_[cast_mode] = sources;
90
91 std::unique_ptr<CastModeMediaSinksObserver> observer(
92 new CastModeMediaSinksObserver(cast_mode, source, origin, router_, this));
93 observer->Init();
94 auto result =
95 sinks_observers_.insert(std::make_pair(cast_mode, std::move(observer)));
96 DCHECK(result.second);
97 NotifyOnResultsUpdated(); 101 NotifyOnResultsUpdated();
98 } 102 }
99 103
100 void QueryResultManager::StopSinksQuery(MediaCastMode cast_mode) { 104 void QueryResultManager::RemoveSourcesForCastMode(MediaCastMode cast_mode) {
101 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 105 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
102 RemoveObserverForCastMode(cast_mode); 106 RemoveOldSourcesForCastMode(cast_mode, std::vector<MediaSource>());
103 SetSourceForCastMode(cast_mode, MediaSource()); 107 cast_mode_sources_.erase(cast_mode);
104 UpdateWithSinksQueryResult(cast_mode, std::vector<MediaSink>());
105 NotifyOnResultsUpdated(); 108 NotifyOnResultsUpdated();
106 } 109 }
107 110
108 void QueryResultManager::SetSourceForCastMode( 111 CastModeSet QueryResultManager::GetSupportedCastModes() const {
109 MediaCastMode cast_mode, const MediaSource& source) {
110 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 112 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
111 cast_mode_sources_[cast_mode] = source; 113 CastModeSet modes;
114 for (const auto& cast_mode_pair : cast_mode_sources_)
115 modes.insert(cast_mode_pair.first);
116
117 return modes;
112 } 118 }
113 119
114 void QueryResultManager::RemoveObserverForCastMode(MediaCastMode cast_mode) { 120 std::unique_ptr<MediaSource> QueryResultManager::GetSourceForCastModeAndSink(
115 auto observers_it = sinks_observers_.find(cast_mode); 121 MediaCastMode cast_mode,
116 if (observers_it != sinks_observers_.end()) 122 MediaSink::Id sink_id) const {
117 sinks_observers_.erase(observers_it); 123 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
124 for (const auto& sink_pair : all_sinks_) {
125 if (sink_pair.first.id() == sink_id) {
126 return GetHighestPrioritySourceForCastModeAndSink(cast_mode,
127 sink_pair.second);
128 }
129 }
130 return std::unique_ptr<MediaSource>();
118 } 131 }
119 132
120 bool QueryResultManager::IsValid(const MediaSinkWithCastModes& entry) const { 133 std::vector<MediaSource> QueryResultManager::GetSourcesForCastMode(
121 return !entry.cast_modes.empty(); 134 MediaCastMode cast_mode) const {
135 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
136 const auto& cast_mode_it = cast_mode_sources_.find(cast_mode);
137 return cast_mode_it == cast_mode_sources_.end() ? std::vector<MediaSource>()
138 : cast_mode_it->second;
122 } 139 }
123 140
124 void QueryResultManager::UpdateWithSinksQueryResult( 141 void QueryResultManager::RemoveOldSourcesForCastMode(
125 MediaCastMode cast_mode, 142 MediaCastMode cast_mode,
126 const std::vector<MediaSink>& result) { 143 const std::vector<MediaSource>& new_sources) {
127 base::hash_set<MediaSink::Id> result_sink_ids; 144 const auto& cast_mode_it = cast_mode_sources_.find(cast_mode);
128 for (const MediaSink& sink : result) 145 if (cast_mode_it == cast_mode_sources_.end())
129 result_sink_ids.insert(sink.id()); 146 return;
147
148 for (const MediaSource& source : cast_mode_it->second) {
149 if (!base::ContainsValue(new_sources, source)) {
150 sinks_observers_.erase(source);
151 SetSinksCompatibleWithSource(cast_mode, source, std::vector<MediaSink>());
152 }
153 }
154 }
155
156 void QueryResultManager::AddObserversForCastMode(
157 MediaCastMode cast_mode,
158 const std::vector<MediaSource>& sources,
159 const GURL& origin) {
160 for (const MediaSource& source : sources) {
161 if (!base::ContainsKey(sinks_observers_, source)) {
162 std::unique_ptr<MediaSourceMediaSinksObserver> observer(
163 new MediaSourceMediaSinksObserver(cast_mode, source, origin, router_,
164 this));
165 observer->Init();
166 sinks_observers_[source] = std::move(observer);
167 }
168 }
169 }
170
171 void QueryResultManager::SetSinksCompatibleWithSource(
172 MediaCastMode cast_mode,
173 const MediaSource& source,
174 const std::vector<MediaSink>& new_sinks) {
175 base::hash_set<MediaSink::Id> new_sink_ids;
176 for (const MediaSink& sink : new_sinks)
177 new_sink_ids.insert(sink.id());
130 178
131 // (1) Iterate through current sink set, remove cast mode from those that 179 // (1) Iterate through current sink set, remove cast mode from those that
132 // do not appear in latest result. 180 // do not appear in latest result.
133 for (auto it = all_sinks_.begin(); it != all_sinks_.end(); /*no-op*/) { 181 for (auto it = all_sinks_.begin(); it != all_sinks_.end(); /*no-op*/) {
134 if (!base::ContainsKey(result_sink_ids, it->first)) { 182 const MediaSink& sink = it->first;
135 it->second.cast_modes.erase(cast_mode); 183 CastModesWithMediaSources& sources_for_sink = it->second;
136 } 184 if (!base::ContainsKey(new_sink_ids, sink.id()))
137 if (!IsValid(it->second)) { 185 sources_for_sink.RemoveSource(cast_mode, source);
186 if (sources_for_sink.IsEmpty())
138 all_sinks_.erase(it++); 187 all_sinks_.erase(it++);
139 } else { 188 else
140 ++it; 189 ++it;
141 }
142 } 190 }
143 191
144 // (2) Add / update sinks with latest result. 192 // (2) Add / update sinks with latest result.
145 for (const MediaSink& sink : result) { 193 for (const MediaSink& sink : new_sinks)
146 auto result = 194 all_sinks_[sink].AddSource(cast_mode, source);
147 all_sinks_.insert(std::make_pair(sink.id(),
148 MediaSinkWithCastModes(sink)));
149 if (!result.second)
150 result.first->second.sink = sink;
151 result.first->second.cast_modes.insert(cast_mode);
152 }
153 } 195 }
154 196
155 CastModeSet QueryResultManager::GetSupportedCastModes() const { 197 std::unique_ptr<MediaSource>
156 CastModeSet modes; 198 QueryResultManager::GetHighestPrioritySourceForCastModeAndSink(
157 for (const auto& observer_pair : sinks_observers_) 199 MediaCastMode cast_mode,
158 modes.insert(observer_pair.first); 200 const CastModesWithMediaSources& sources_for_sink) const {
159 return modes; 201 const auto& cast_mode_it = cast_mode_sources_.find(cast_mode);
202 if (cast_mode_it == cast_mode_sources_.end())
203 return std::unique_ptr<MediaSource>();
204
205 for (const MediaSource& source : cast_mode_it->second) {
206 if (sources_for_sink.HasSource(cast_mode, source))
207 return base::MakeUnique<MediaSource>(source.id());
208 }
209 return std::unique_ptr<MediaSource>();
160 } 210 }
161 211
162 MediaSource QueryResultManager::GetSourceForCastMode( 212 bool QueryResultManager::AreSourcesValidForCastMode(
163 MediaCastMode cast_mode) const { 213 MediaCastMode cast_mode,
164 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 214 const std::vector<MediaSource>& sources) const {
165 auto source_it = cast_mode_sources_.find(cast_mode); 215 const auto& cast_mode_it = cast_mode_sources_.find(cast_mode);
166 return source_it == cast_mode_sources_.end() ? 216 bool has_cast_mode = cast_mode_it != cast_mode_sources_.end();
167 MediaSource() : source_it->second; 217 // If a source has already been registered, then it must be associated with
218 // |cast_mode|.
219 return std::find_if(
220 sources.begin(), sources.end(), [=](const MediaSource& source) {
221 return base::ContainsKey(sinks_observers_, source) &&
222 (!has_cast_mode ||
223 !base::ContainsValue(cast_mode_it->second, source));
224 }) == sources.end();
168 } 225 }
169 226
170 void QueryResultManager::NotifyOnResultsUpdated() { 227 void QueryResultManager::NotifyOnResultsUpdated() {
171 std::vector<MediaSinkWithCastModes> sinks; 228 std::vector<MediaSinkWithCastModes> sinks;
172 for (const auto& sink_pair : all_sinks_) { 229 for (const auto& sink_pair : all_sinks_) {
173 sinks.push_back(sink_pair.second); 230 MediaSinkWithCastModes sink_with_cast_modes(sink_pair.first);
231 sink_with_cast_modes.cast_modes = sink_pair.second.GetCastModes();
232 sinks.push_back(sink_with_cast_modes);
174 } 233 }
175 FOR_EACH_OBSERVER(QueryResultManager::Observer, observers_, 234 FOR_EACH_OBSERVER(QueryResultManager::Observer, observers_,
176 OnResultsUpdated(sinks)); 235 OnResultsUpdated(sinks));
177 } 236 }
178 237
179 } // namespace media_router 238 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698