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

Unified Diff: chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc

Issue 2701633002: [Media Router] Add DialMediaSinkService and DeviceDescriptionService (Closed)
Patch Set: resolve code review comments from Mark and Derek Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc b/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d65863ba773bf0958ccbe8feeee42e7f7653b8e6
--- /dev/null
+++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc
@@ -0,0 +1,149 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/media/router/discovery/dial/dial_media_sink_service.h"
+
+#include "chrome/browser/media/router/discovery/dial/dial_device_data.h"
+#include "chrome/browser/media/router/discovery/media_sink_internal.h"
+#include "chrome/browser/profiles/profile.h"
+#include "content/public/browser/browser_thread.h"
+
+using content::BrowserThread;
+
+namespace {
+// Time interval when media sink service sends sinks to MRP.
+const int kFetchCompleteTimeoutSecs = 3;
+}
+
+namespace media_router {
+
+DialMediaSinkService::DialMediaSinkService(
+ const OnSinksDiscoveredCallback& callback,
+ content::BrowserContext* browser_context)
+ : MediaSinkService(callback), browser_context_(browser_context) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ auto* profile = Profile::FromBrowserContext(browser_context_);
+ request_context_ = profile->GetRequestContext();
+
+ DCHECK(request_context_);
+}
+
+DialMediaSinkService::~DialMediaSinkService() {}
+
+void DialMediaSinkService::Start() {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ dial_registry()->RegisterObserver(this);
+ dial_registry()->DiscoverNow();
+}
+
+void DialMediaSinkService::Stop() {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ dial_registry()->UnregisterObserver(this);
+}
+
+void DialMediaSinkService::AddSinkQuery(MediaSinksObserver* observer) {
+ // TODO(crbug.com/687375): Implement DIAL sink query.
+ NOTIMPLEMENTED();
+}
+
+void DialMediaSinkService::RemoveSinkQuery(MediaSinksObserver* observer) {
+ // TODO(crbug.com/687375): Implement DIAL sink query.
+ NOTIMPLEMENTED();
+}
+
+DialRegistry* DialMediaSinkService::dial_registry() {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ return DialRegistry::GetInstance();
+}
+
+DeviceDescriptionService* DialMediaSinkService::GetDescriptionService() {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ if (!description_service_.get()) {
+ description_service_.reset(new DeviceDescriptionService(
+ base::Bind(&DialMediaSinkService::OnDeviceDescriptionAvailable,
+ base::Unretained(this)),
+ base::Bind(&DialMediaSinkService::OnDeviceDescriptionError,
+ base::Unretained(this))));
+ }
+ return description_service_.get();
+}
+
+void DialMediaSinkService::OnDialDeviceEvent(
+ const DialRegistry::DeviceList& devices) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ DVLOG(2) << "DialMediaSinkService::OnDialDeviceEvent found " << devices.size()
+ << " devices";
+
+ // Add a finish timer.
+ finish_timer_.reset(new base::OneShotTimer());
+ base::TimeDelta finish_delay =
+ base::TimeDelta::FromSeconds(kFetchCompleteTimeoutSecs);
+ finish_timer_->Start(FROM_HERE, finish_delay, this,
+ &DialMediaSinkService::FetchCompleted);
+
+ current_sinks_.clear();
+ GetDescriptionService()->GetDeviceDescriptions(devices, request_context_);
+}
+
+void DialMediaSinkService::OnDialError(DialRegistry::DialErrorCode type) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ DVLOG(2) << "OnDialError [DialErrorCode]: " << static_cast<int>(type);
+}
+
+void DialMediaSinkService::OnDeviceDescriptionAvailable(
+ const DialDeviceData& device_data,
+ const ParsedDialDeviceDescription& description_data) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+ MediaSink sink(description_data.unique_id, description_data.friendly_name,
+ MediaSink::IconType::GENERIC);
+ DialSinkExtraData extra_data;
+ extra_data.app_url = description_data.app_url;
+ extra_data.model_name = description_data.model_name;
+ std::string ip_address = device_data.device_description_url().host();
+ if (!extra_data.ip_address.AssignFromIPLiteral(ip_address)) {
+ DVLOG(1) << "Invalid ip_address: " << ip_address;
+ return;
+ }
+
+ current_sinks_.insert(MediaSinkInternal(sink, extra_data));
+
+ if (finish_timer_)
+ return;
+
+ // Start fetch timer again if device description comes back after
+ // |finish_timer_| fires.
+ base::TimeDelta finish_delay =
+ base::TimeDelta::FromSeconds(kFetchCompleteTimeoutSecs);
+ finish_timer_.reset(new base::OneShotTimer());
+ finish_timer_->Start(FROM_HERE, finish_delay, this,
+ &DialMediaSinkService::FetchCompleted);
+}
+
+void DialMediaSinkService::OnDeviceDescriptionError(
+ const DialDeviceData& device,
+ const std::string& error_message) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ DVLOG(2) << "OnDescriptionFetchesError [message]: " << error_message;
+}
+
+void DialMediaSinkService::FetchCompleted() {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ DCHECK(!sink_discovery_callback_.is_null());
+
+ finish_timer_.reset();
+
+ auto sinks = current_sinks_;
+ if (sinks == mrp_sinks_) {
+ DVLOG(2) << "No update to sink list.";
+ return;
+ }
+
+ DVLOG(2) << "Send sinks to media router, [size]: " << sinks.size();
+ std::vector<MediaSinkInternal> vec_sinks(sinks.begin(), sinks.end());
mark a. foltz 2017/04/18 18:16:27 Can this be inlined into Run()?
zhaobin 2017/04/21 23:12:59 Done.
+ sink_discovery_callback_.Run(vec_sinks);
+ mrp_sinks_ = std::move(sinks);
+}
+
+} // namespace media_router

Powered by Google App Engine
This is Rietveld 408576698