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

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: Address Mark and Derek's comments 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"
8 #include "base/stl_util.h" 10 #include "base/stl_util.h"
9 #include "chrome/browser/media/router/media_router.h" 11 #include "chrome/browser/media/router/media_router.h"
10 #include "chrome/browser/media/router/media_sinks_observer.h" 12 #include "chrome/browser/media/router/media_sinks_observer.h"
11 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
12 14
13 namespace media_router { 15 namespace media_router {
14 16
15 // MediaSinkObserver that propagates results back to |result_manager|. 17 // MediaSinkObserver that propagates results back to |result_manager|.
16 // An instance of this class is associated with each registered MediaCastMode. 18 // An instance of this class is associated with each registered MediaSource.
17 class QueryResultManager::CastModeMediaSinksObserver 19 class QueryResultManager::CastModeMediaSinksObserver
18 : public MediaSinksObserver { 20 : public MediaSinksObserver {
19 public: 21 public:
20 CastModeMediaSinksObserver(MediaCastMode cast_mode, 22 CastModeMediaSinksObserver(MediaCastMode cast_mode,
21 const MediaSource& source, 23 const MediaSource& source,
22 const GURL& origin, 24 const GURL& origin,
23 MediaRouter* router, 25 MediaRouter* router,
24 QueryResultManager* result_manager) 26 QueryResultManager* result_manager)
25 : MediaSinksObserver(router, source, origin), 27 : MediaSinksObserver(router, source, origin),
26 cast_mode_(cast_mode), 28 cast_mode_(cast_mode),
29 source_(source),
27 result_manager_(result_manager) { 30 result_manager_(result_manager) {
28 DCHECK(result_manager); 31 DCHECK(result_manager);
29 } 32 }
30 33
31 ~CastModeMediaSinksObserver() override {} 34 ~CastModeMediaSinksObserver() override {}
32 35
33 // MediaSinksObserver 36 // MediaSinksObserver
34 void OnSinksReceived(const std::vector<MediaSink>& result) override { 37 void OnSinksReceived(const std::vector<MediaSink>& result) override {
35 latest_sink_ids_.clear(); 38 latest_sink_ids_.clear();
36 for (const MediaSink& sink : result) { 39 for (const MediaSink& sink : result) {
37 latest_sink_ids_.push_back(sink.id()); 40 latest_sink_ids_.push_back(sink.id());
38 } 41 }
39 result_manager_->UpdateWithSinksQueryResult(cast_mode_, result); 42 result_manager_->SetSinksCompatibleWithSource(cast_mode_, source_, result);
40 result_manager_->NotifyOnResultsUpdated(); 43 result_manager_->NotifyOnResultsUpdated();
41 } 44 }
42 45
43 // Returns the most recent sink IDs that were passed to |OnSinksReceived|. 46 // Returns the most recent sink IDs that were passed to |OnSinksReceived|.
44 void GetLatestSinkIds(std::vector<MediaSink::Id>* sink_ids) const { 47 void GetLatestSinkIds(std::vector<MediaSink::Id>* sink_ids) const {
45 DCHECK(sink_ids); 48 DCHECK(sink_ids);
46 *sink_ids = latest_sink_ids_; 49 *sink_ids = latest_sink_ids_;
47 } 50 }
48 51
49 MediaCastMode cast_mode() const { return cast_mode_; } 52 MediaCastMode cast_mode() const { return cast_mode_; }
50 53
51 private: 54 private:
52 const MediaCastMode cast_mode_; 55 const MediaCastMode cast_mode_;
56 const MediaSource source_;
53 std::vector<MediaSink::Id> latest_sink_ids_; 57 std::vector<MediaSink::Id> latest_sink_ids_;
54 QueryResultManager* const result_manager_; 58 QueryResultManager* const result_manager_;
55 }; 59 };
56 60
57 QueryResultManager::QueryResultManager(MediaRouter* router) : router_(router) { 61 QueryResultManager::QueryResultManager(MediaRouter* router) : router_(router) {
58 DCHECK(router_); 62 DCHECK(router_);
59 } 63 }
60 64
61 QueryResultManager::~QueryResultManager() { 65 QueryResultManager::~QueryResultManager() {
62 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 66 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
63 } 67 }
64 68
65 void QueryResultManager::AddObserver(Observer* observer) { 69 void QueryResultManager::AddObserver(Observer* observer) {
66 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 70 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
67 DCHECK(observer); 71 DCHECK(observer);
68 observers_.AddObserver(observer); 72 observers_.AddObserver(observer);
69 } 73 }
70 74
71 void QueryResultManager::RemoveObserver(Observer* observer) { 75 void QueryResultManager::RemoveObserver(Observer* observer) {
72 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 76 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
73 DCHECK(observer); 77 DCHECK(observer);
74 observers_.RemoveObserver(observer); 78 observers_.RemoveObserver(observer);
75 } 79 }
76 80
77 void QueryResultManager::StartSinksQuery(MediaCastMode cast_mode, 81 void QueryResultManager::SetSourcesForCastMode(
78 const MediaSource& source, 82 MediaCastMode cast_mode,
79 const GURL& origin) { 83 const std::vector<MediaSource>& sources,
84 const GURL& origin) {
80 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 85 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
81 if (source.Empty()) { 86 if (sources.empty()) {
82 LOG(WARNING) << "StartSinksQuery called with empty source for " 87 LOG(WARNING) << "SetSourcesForCastMode called with empty sources for "
88 << cast_mode;
89 return;
90 }
91 if (!AreSourcesValidForCastMode(cast_mode, sources)) {
92 LOG(WARNING) << "SetSourcesForCastMode called with invalid sources for "
83 << cast_mode; 93 << cast_mode;
84 return; 94 return;
85 } 95 }
86 96
87 SetSourceForCastMode(cast_mode, source); 97 RemoveOldSourcesForCastMode(cast_mode, sources);
88 RemoveObserverForCastMode(cast_mode); 98 AddObserversForCastMode(cast_mode, sources, origin);
89 UpdateWithSinksQueryResult(cast_mode, std::vector<MediaSink>()); 99 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(); 100 NotifyOnResultsUpdated();
98 } 101 }
99 102
100 void QueryResultManager::StopSinksQuery(MediaCastMode cast_mode) { 103 void QueryResultManager::RemoveSourcesForCastMode(MediaCastMode cast_mode) {
101 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 104 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
102 RemoveObserverForCastMode(cast_mode); 105 RemoveOldSourcesForCastMode(cast_mode, std::vector<MediaSource>());
103 SetSourceForCastMode(cast_mode, MediaSource()); 106 cast_mode_sources_.erase(cast_mode);
104 UpdateWithSinksQueryResult(cast_mode, std::vector<MediaSink>());
105 NotifyOnResultsUpdated(); 107 NotifyOnResultsUpdated();
106 } 108 }
107 109
108 void QueryResultManager::SetSourceForCastMode( 110 CastModeSet QueryResultManager::GetSupportedCastModes() const {
109 MediaCastMode cast_mode, const MediaSource& source) {
110 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 111 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
111 cast_mode_sources_[cast_mode] = source; 112 CastModeSet modes;
113 for (const auto& observer_pair : cast_mode_sources_)
114 modes.insert(observer_pair.first);
115
116 return modes;
112 } 117 }
113 118
114 void QueryResultManager::RemoveObserverForCastMode(MediaCastMode cast_mode) { 119 std::unique_ptr<MediaSource> QueryResultManager::GetSourceForCastModeAndSink(
115 auto observers_it = sinks_observers_.find(cast_mode); 120 MediaCastMode cast_mode,
116 if (observers_it != sinks_observers_.end()) 121 MediaSink::Id sink_id) const {
117 sinks_observers_.erase(observers_it); 122 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
123 for (const auto& sink_pair : all_sinks_) {
124 if (sink_pair.first.id() == sink_id) {
125 return GetHighestPrioritySourceForCastModeAndSink(cast_mode,
126 sink_pair.second);
127 }
128 }
129 return std::unique_ptr<MediaSource>();
118 } 130 }
119 131
120 bool QueryResultManager::IsValid(const MediaSinkWithCastModes& entry) const { 132 std::vector<MediaSource> QueryResultManager::GetSourcesForCastMode(
121 return !entry.cast_modes.empty(); 133 MediaCastMode cast_mode) const {
134 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
135 const auto& cast_mode_it = cast_mode_sources_.find(cast_mode);
136 return cast_mode_it == cast_mode_sources_.end()
137 ? std::vector<MediaSource>() : cast_mode_it->second;
122 } 138 }
123 139
124 void QueryResultManager::UpdateWithSinksQueryResult( 140 void QueryResultManager::RemoveOldSourcesForCastMode(
125 MediaCastMode cast_mode, 141 MediaCastMode cast_mode,
126 const std::vector<MediaSink>& result) { 142 const std::vector<MediaSource>& new_sources) {
127 base::hash_set<MediaSink::Id> result_sink_ids; 143 const auto& cast_mode_it = cast_mode_sources_.find(cast_mode);
128 for (const MediaSink& sink : result) 144 if (cast_mode_it == cast_mode_sources_.end())
129 result_sink_ids.insert(sink.id()); 145 return;
146
147 for (const MediaSource& source : cast_mode_it->second) {
148 if (!base::ContainsValue(new_sources, source)) {
149 sinks_observers_.erase(source);
150 SetSinksCompatibleWithSource(cast_mode, source, std::vector<MediaSink>());
151 }
152 }
153 }
154
155 void QueryResultManager::AddObserversForCastMode(
156 MediaCastMode cast_mode,
157 const std::vector<MediaSource>& sources,
158 const GURL& origin) {
159 for (const MediaSource& source : sources) {
160 if (!base::ContainsKey(sinks_observers_, source)) {
161 std::unique_ptr<CastModeMediaSinksObserver> observer(
162 new CastModeMediaSinksObserver(cast_mode, source, origin, router_,
163 this));
164 observer->Init();
165 sinks_observers_[source] = std::move(observer);
166 }
167 }
168 }
169
170 void QueryResultManager::SetSinksCompatibleWithSource(
171 MediaCastMode cast_mode,
172 const MediaSource& source,
173 const std::vector<MediaSink>& new_sinks) {
174 base::hash_set<MediaSink::Id> new_sink_ids;
175 for (const MediaSink& sink : new_sinks)
176 new_sink_ids.insert(sink.id());
130 177
131 // (1) Iterate through current sink set, remove cast mode from those that 178 // (1) Iterate through current sink set, remove cast mode from those that
132 // do not appear in latest result. 179 // do not appear in latest result.
133 for (auto it = all_sinks_.begin(); it != all_sinks_.end(); /*no-op*/) { 180 for (auto it = all_sinks_.begin(); it != all_sinks_.end(); /*no-op*/) {
134 if (!base::ContainsKey(result_sink_ids, it->first)) { 181 const MediaSink& sink = it->first;
135 it->second.cast_modes.erase(cast_mode); 182 CastModesWithMediaSources& sources_for_sink = it->second;
136 } 183 if (!base::ContainsKey(new_sink_ids, sink.id()))
137 if (!IsValid(it->second)) { 184 sources_for_sink.RemoveSource(cast_mode, source);
185 if (sources_for_sink.IsEmpty())
138 all_sinks_.erase(it++); 186 all_sinks_.erase(it++);
139 } else { 187 else
140 ++it; 188 ++it;
141 }
142 } 189 }
143 190
144 // (2) Add / update sinks with latest result. 191 // (2) Add / update sinks with latest result.
145 for (const MediaSink& sink : result) { 192 for (const MediaSink& sink : new_sinks)
146 auto result = 193 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 } 194 }
154 195
155 CastModeSet QueryResultManager::GetSupportedCastModes() const { 196 std::unique_ptr<MediaSource>
156 CastModeSet modes; 197 QueryResultManager::GetHighestPrioritySourceForCastModeAndSink(
157 for (const auto& observer_pair : sinks_observers_) 198 MediaCastMode cast_mode,
158 modes.insert(observer_pair.first); 199 const CastModesWithMediaSources& sources_for_sink) const {
159 return modes; 200 const auto& cast_mode_it = cast_mode_sources_.find(cast_mode);
201 if (cast_mode_it == cast_mode_sources_.end())
202 return std::unique_ptr<MediaSource>();
203
204 for (const MediaSource& source : cast_mode_it->second) {
205 if (sources_for_sink.HasSource(cast_mode, source))
206 return std::unique_ptr<MediaSource>(new MediaSource(source.id()));
207 }
208 return std::unique_ptr<MediaSource>();
160 } 209 }
161 210
162 MediaSource QueryResultManager::GetSourceForCastMode( 211 bool QueryResultManager::AreSourcesValidForCastMode(
163 MediaCastMode cast_mode) const { 212 MediaCastMode cast_mode,
164 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 213 const std::vector<MediaSource>& sources) const {
165 auto source_it = cast_mode_sources_.find(cast_mode); 214 const auto& cast_mode_it = cast_mode_sources_.find(cast_mode);
mark a. foltz 2016/09/13 17:30:15 Nit: combine this with statement below
takumif 2016/09/13 19:20:34 |cast_mode_it| is reused in the lambda function be
mark a. foltz 2016/09/13 20:38:18 I missed that; NM.
166 return source_it == cast_mode_sources_.end() ? 215 bool has_cast_mode = cast_mode_it != cast_mode_sources_.end();
167 MediaSource() : source_it->second; 216 // If a source has already been registered, then it must be associated with
217 // |cast_mode|.
218 return std::find_if(sources.begin(), sources.end(),
219 [=](const MediaSource& source) {
220 return base::ContainsKey(sinks_observers_, source) &&
221 (!has_cast_mode ||
222 !base::ContainsValue(
223 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 sinks.push_back(GetMediaSinkWithCastModes(sink_pair.first));
174 }
175 FOR_EACH_OBSERVER(QueryResultManager::Observer, observers_, 231 FOR_EACH_OBSERVER(QueryResultManager::Observer, observers_,
176 OnResultsUpdated(sinks)); 232 OnResultsUpdated(sinks));
233 }
234
235 MediaSinkWithCastModes QueryResultManager::GetMediaSinkWithCastModes(
236 const MediaSink& sink) {
237 MediaSinkWithCastModes sink_with_cast_modes(sink);
238 sink_with_cast_modes.cast_modes = all_sinks_[sink].GetCastModes();
239 return sink_with_cast_modes;
177 } 240 }
178 241
179 } // namespace media_router 242 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698