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

Unified Diff: content/browser/media/session/media_session_delegate_android.cc

Issue 2439483003: Link MediaSessionTabHelper with native MediaSession [CL is going to be split] (Closed)
Patch Set: addressed nits Created 4 years, 2 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: content/browser/media/session/media_session_delegate_android.cc
diff --git a/content/browser/media/session/media_session_delegate_android.cc b/content/browser/media/session/media_session_delegate_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d77446d298db18b99c3227216690d8946b43b7c4
--- /dev/null
+++ b/content/browser/media/session/media_session_delegate_android.cc
@@ -0,0 +1,110 @@
+// Copyright 2016 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 "content/browser/media/session/media_session_delegate_android.h"
+
+#include "base/android/context_utils.h"
+#include "base/android/jni_android.h"
+#include "content/browser/media/session/media_session.h"
+#include "content/common/android/media_metadata_android.h"
+#include "jni/MediaSessionDelegate_jni.h"
+
+using base::android::JavaParamRef;
+
+namespace content {
+
+// static
+bool MediaSessionDelegateAndroid::Register(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
+
+// static
+void MediaSessionDelegateAndroid::CreateAndConnect(
+ MediaSession* session,
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& j_delegate) {
+ MediaSessionDelegateAndroid* delegate =
+ new MediaSessionDelegateAndroid(session, env, j_delegate);
+ session->PassObserverOwnership(
+ std::unique_ptr<MediaSessionDelegateAndroid>(delegate));
+ Java_MediaSessionDelegate_mediaSessionConnected(
+ env, j_delegate, reinterpret_cast<intptr_t>(delegate));
+}
+
+MediaSessionDelegateAndroid::MediaSessionDelegateAndroid(
+ MediaSession* session,
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& j_delegate)
+ : MediaSessionObserver(session), j_delegate_(env, j_delegate) {}
+
+MediaSessionDelegateAndroid::~MediaSessionDelegateAndroid() {
+ MediaSessionDisconnected();
+ j_delegate_.reset();
whywhat 2016/10/20 22:56:53 Don't think you need to do this in dtor.
Zhiqiang Zhang (Slow) 2016/10/21 13:43:52 Done.
+}
+
+void MediaSessionDelegateAndroid::MediaSessionDisconnected() {
+ MediaSessionObserver::MediaSessionDisconnected();
+ JNIEnv* env = base::android::AttachCurrentThread();
+ DCHECK(env);
+ if (!j_delegate_.is_empty()) {
boliu 2016/10/21 14:37:15 this in theory is not safe because gc could run be
Zhiqiang Zhang (Slow) 2016/10/21 15:05:23 Done.
+ Java_MediaSessionDelegate_mediaSessionDisconnectedWrapper(
+ env, j_delegate_.get(env));
+ }
+}
+
+void MediaSessionDelegateAndroid::MediaSessionStateChanged(bool is_controllable,
+ bool is_active) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ DCHECK(env);
+ if (!j_delegate_.is_empty()) {
+ Java_MediaSessionDelegate_mediaSessionStateChanged(
+ env, j_delegate_.get(env), is_controllable, is_active);
+ }
+}
+
+void MediaSessionDelegateAndroid::MediaSessionMetadataChanged(
+ const base::Optional<MediaMetadata>& metadata) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ DCHECK(env);
+ if (!j_delegate_.is_empty()) {
+ base::android::ScopedJavaLocalRef<jobject> j_metadata;
+ if (metadata.has_value()) {
+ j_metadata =
+ MediaMetadataAndroid::CreateJavaObject(env, metadata.value());
+ }
+ Java_MediaSessionDelegate_mediaSessionMetadataChanged(
+ env, j_delegate_.get(env), j_metadata);
+ }
+}
+
+void MediaSessionDelegateAndroid::ResumeMediaSession(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& obj) {
+ if (session())
+ session()->Resume(MediaSession::SuspendType::UI);
+}
+
+void MediaSessionDelegateAndroid::SuspendMediaSession(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& obj) {
+ if (session())
+ session()->Suspend(MediaSession::SuspendType::UI);
+}
+
+void MediaSessionDelegateAndroid::StopMediaSession(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& obj) {
+ if (session())
+ session()->Stop(MediaSession::SuspendType::UI);
+}
+
+void MediaSessionDelegateAndroid::DisconnectMediaSession(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& obj) {
+ // Will destroy this and send `mediaSessionDisconnected` to Java.
+ if (session())
+ session()->RemoveObserver(this);
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698