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

Unified Diff: chrome/browser/media/android/router/media_router_android_bridge.cc

Issue 2788783002: [Cast,Android] Handle some PresentationAPI edge cases (Closed)
Patch Set: Fixed the unittests 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/android/router/media_router_android_bridge.cc
diff --git a/chrome/browser/media/android/router/media_router_android_bridge.cc b/chrome/browser/media/android/router/media_router_android_bridge.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e56bbb59911ad497536419ee4d229138c9c18a6c
--- /dev/null
+++ b/chrome/browser/media/android/router/media_router_android_bridge.cc
@@ -0,0 +1,197 @@
+// 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/android/router/media_router_android_bridge.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "chrome/browser/media/android/router/media_router_android.h"
+#include "jni/ChromeMediaRouter_jni.h"
+
+using base::android::ConvertUTF8ToJavaString;
+using base::android::ConvertJavaStringToUTF8;
+using base::android::JavaRef;
+using base::android::ScopedJavaLocalRef;
+using base::android::AttachCurrentThread;
+
+namespace media_router {
+
+MediaRouterAndroidBridge::MediaRouterAndroidBridge(MediaRouterAndroid* router)
+ : native_media_router_(router) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ java_media_router_.Reset(
+ Java_ChromeMediaRouter_create(env, reinterpret_cast<jlong>(this)));
+}
+
+MediaRouterAndroidBridge::~MediaRouterAndroidBridge() = default;
+
+// static
+bool MediaRouterAndroidBridge::Register(JNIEnv* env) {
+ bool ret = RegisterNativesImpl(env);
+ DCHECK(g_ChromeMediaRouter_clazz);
+ return ret;
+}
+
+void MediaRouterAndroidBridge::CreateRoute(const MediaSource::Id& source_id,
+ const MediaSink::Id& sink_id,
+ const std::string& presentation_id,
+ const url::Origin& origin,
+ int tab_id,
+ bool is_incognito,
+ int route_request_id) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ ScopedJavaLocalRef<jstring> jsource_id =
+ base::android::ConvertUTF8ToJavaString(env, source_id);
+ ScopedJavaLocalRef<jstring> jsink_id =
+ base::android::ConvertUTF8ToJavaString(env, sink_id);
+ ScopedJavaLocalRef<jstring> jpresentation_id =
+ base::android::ConvertUTF8ToJavaString(env, presentation_id);
+ // TODO(crbug.com/685358): Unique origins should not be considered
+ // same-origin.
+ ScopedJavaLocalRef<jstring> jorigin =
+ base::android::ConvertUTF8ToJavaString(env, origin.GetURL().spec());
+
+ Java_ChromeMediaRouter_createRoute(env, java_media_router_, jsource_id,
+ jsink_id, jpresentation_id, jorigin,
+ tab_id, is_incognito, route_request_id);
+}
+
+void MediaRouterAndroidBridge::JoinRoute(const MediaSource::Id& source_id,
+ const std::string& presentation_id,
+ const url::Origin& origin,
+ int tab_id,
+ int route_request_id) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ ScopedJavaLocalRef<jstring> jsource_id =
+ base::android::ConvertUTF8ToJavaString(env, source_id);
+ ScopedJavaLocalRef<jstring> jpresentation_id =
+ base::android::ConvertUTF8ToJavaString(env, presentation_id);
+ ScopedJavaLocalRef<jstring> jorigin =
+ base::android::ConvertUTF8ToJavaString(env, origin.GetURL().spec());
+
+ Java_ChromeMediaRouter_joinRoute(env, java_media_router_, jsource_id,
+ jpresentation_id, jorigin, tab_id,
+ route_request_id);
+}
+
+void MediaRouterAndroidBridge::TerminateRoute(const MediaRoute::Id& route_id) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ ScopedJavaLocalRef<jstring> jroute_id =
+ base::android::ConvertUTF8ToJavaString(env, route_id);
+ Java_ChromeMediaRouter_closeRoute(env, java_media_router_, jroute_id);
+}
+
+void MediaRouterAndroidBridge::SendRouteMessage(const MediaRoute::Id& route_id,
+ const std::string& message,
+ int callback_id) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ ScopedJavaLocalRef<jstring> jroute_id =
+ base::android::ConvertUTF8ToJavaString(env, route_id);
+ ScopedJavaLocalRef<jstring> jmessage =
+ base::android::ConvertUTF8ToJavaString(env, message);
+ Java_ChromeMediaRouter_sendStringMessage(env, java_media_router_, jroute_id,
+ jmessage, callback_id);
+}
+
+void MediaRouterAndroidBridge::DetachRoute(const MediaRoute::Id& route_id) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ ScopedJavaLocalRef<jstring> jroute_id =
+ base::android::ConvertUTF8ToJavaString(env, route_id);
+ Java_ChromeMediaRouter_detachRoute(env, java_media_router_, jroute_id);
+}
+
+bool MediaRouterAndroidBridge::StartObservingMediaSinks(
+ const MediaSource::Id& source_id) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ ScopedJavaLocalRef<jstring> jsource_id =
+ base::android::ConvertUTF8ToJavaString(env, source_id);
+ return Java_ChromeMediaRouter_startObservingMediaSinks(
+ env, java_media_router_, jsource_id);
+}
+
+void MediaRouterAndroidBridge::StopObservingMediaSinks(
+ const MediaSource::Id& source_id) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ ScopedJavaLocalRef<jstring> jsource_id =
+ base::android::ConvertUTF8ToJavaString(env, source_id);
+ Java_ChromeMediaRouter_stopObservingMediaSinks(env, java_media_router_,
+ jsource_id);
+}
+
+void MediaRouterAndroidBridge::OnSinksReceived(
+ JNIEnv* env,
+ const JavaRef<jobject>& obj,
+ const JavaRef<jstring>& jsource_urn,
+ jint jcount) {
+ std::vector<MediaSink> sinks_converted;
+ sinks_converted.reserve(jcount);
+ for (int i = 0; i < jcount; ++i) {
+ ScopedJavaLocalRef<jstring> jsink_urn = Java_ChromeMediaRouter_getSinkUrn(
+ env, java_media_router_, jsource_urn, i);
+ ScopedJavaLocalRef<jstring> jsink_name = Java_ChromeMediaRouter_getSinkName(
+ env, java_media_router_, jsource_urn, i);
+ sinks_converted.push_back(MediaSink(
+ ConvertJavaStringToUTF8(env, jsink_urn.obj()),
+ ConvertJavaStringToUTF8(env, jsink_name.obj()), MediaSink::GENERIC));
+ }
+ native_media_router_->OnSinksReceived(
+ ConvertJavaStringToUTF8(env, jsource_urn), sinks_converted);
+}
+
+void MediaRouterAndroidBridge::OnRouteCreated(
+ JNIEnv* env,
+ const JavaRef<jobject>& obj,
+ const JavaRef<jstring>& jmedia_route_id,
+ const JavaRef<jstring>& jsink_id,
+ jint jroute_request_id,
+ jboolean jis_local) {
+ native_media_router_->OnRouteCreated(
+ ConvertJavaStringToUTF8(env, jmedia_route_id),
+ ConvertJavaStringToUTF8(env, jsink_id), jroute_request_id, jis_local);
+}
+
+void MediaRouterAndroidBridge::OnRouteRequestError(
+ JNIEnv* env,
+ const JavaRef<jobject>& obj,
+ const JavaRef<jstring>& jerror_text,
+ jint jroute_request_id) {
+ native_media_router_->OnRouteRequestError(
+ ConvertJavaStringToUTF8(jerror_text), jroute_request_id);
+}
+
+void MediaRouterAndroidBridge::OnRouteClosed(
+ JNIEnv* env,
+ const JavaRef<jobject>& obj,
+ const JavaRef<jstring>& jmedia_route_id) {
+ native_media_router_->OnRouteClosed(
+ ConvertJavaStringToUTF8(env, jmedia_route_id));
+}
+
+void MediaRouterAndroidBridge::OnRouteClosedWithError(
+ JNIEnv* env,
+ const JavaRef<jobject>& obj,
+ const JavaRef<jstring>& jmedia_route_id,
+ const JavaRef<jstring>& jmessage) {
+ native_media_router_->OnRouteClosedWithError(
+ ConvertJavaStringToUTF8(env, jmedia_route_id),
+ ConvertJavaStringToUTF8(env, jmessage));
+}
+
+void MediaRouterAndroidBridge::OnMessageSentResult(JNIEnv* env,
+ const JavaRef<jobject>& obj,
+ jboolean jsuccess,
+ jint jcallback_id) {
+ native_media_router_->OnMessageSentResult(jsuccess, jcallback_id);
+}
+
+void MediaRouterAndroidBridge::OnMessage(
+ JNIEnv* env,
+ const JavaRef<jobject>& obj,
+ const JavaRef<jstring>& jmedia_route_id,
+ const JavaRef<jstring>& jmessage) {
+ native_media_router_->OnMessage(ConvertJavaStringToUTF8(env, jmedia_route_id),
+ ConvertJavaStringToUTF8(env, jmessage));
+}
+
+} // namespace media_router

Powered by Google App Engine
This is Rietveld 408576698