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

Unified Diff: media/base/android/media_player_bridge.cc

Issue 643353002: Listen to the audio focus event for MSE/EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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: media/base/android/media_player_bridge.cc
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index c95d8575edcdf454129d03f490a0d0aa64122b80..8ef5aa5650e45c726ab43adac5523d476fdedbd9 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -51,8 +51,6 @@ MediaPlayerBridge::MediaPlayerBridge(
volume_(-1.0),
allow_credentials_(allow_credentials),
weak_factory_(this) {
- listener_.reset(new MediaPlayerListener(base::MessageLoopProxy::current(),
- weak_factory_.GetWeakPtr()));
}
MediaPlayerBridge::~MediaPlayerBridge() {
@@ -104,7 +102,7 @@ void MediaPlayerBridge::CreateJavaMediaPlayerBridge() {
if (volume_ >= 0)
SetVolume(volume_);
- SetMediaPlayerListener();
+ AttachListener(j_media_player_bridge_.obj());
xhwang 2014/10/14 18:23:30 Where do we detach listener?
qinmin 2014/10/14 21:55:51 good catch, should be in release() call. Fixed.
}
void MediaPlayerBridge::SetJavaMediaPlayerBridge(
@@ -122,13 +120,6 @@ base::android::ScopedJavaLocalRef<jobject> MediaPlayerBridge::
return j_bridge;
}
-void MediaPlayerBridge::SetMediaPlayerListener() {
- jobject j_context = base::android::GetApplicationContext();
- DCHECK(j_context);
-
- listener_->CreateMediaPlayerListener(j_context, j_media_player_bridge_.obj());
-}
-
void MediaPlayerBridge::SetDuration(base::TimeDelta duration) {
duration_ = duration;
}
@@ -389,7 +380,6 @@ void MediaPlayerBridge::Release() {
JNIEnv* env = base::android::AttachCurrentThread();
Java_MediaPlayerBridge_release(env, j_media_player_bridge_.obj());
j_media_player_bridge_.Reset();
- listener_->ReleaseMediaPlayerListenerResources();
}
void MediaPlayerBridge::SetVolume(double volume) {
@@ -407,29 +397,17 @@ void MediaPlayerBridge::SetVolume(double volume) {
void MediaPlayerBridge::OnVideoSizeChanged(int width, int height) {
width_ = width;
height_ = height;
- manager()->OnVideoSizeChanged(player_id(), width, height);
-}
-
-void MediaPlayerBridge::OnMediaError(int error_type) {
- manager()->OnError(player_id(), error_type);
-}
-
-void MediaPlayerBridge::OnBufferingUpdate(int percent) {
- manager()->OnBufferingUpdate(player_id(), percent);
+ MediaPlayerAndroid::OnVideoSizeChanged(width, height);
}
void MediaPlayerBridge::OnPlaybackComplete() {
time_update_timer_.Stop();
- manager()->OnPlaybackComplete(player_id());
+ MediaPlayerAndroid::OnPlaybackComplete();
}
void MediaPlayerBridge::OnMediaInterrupted() {
time_update_timer_.Stop();
- manager()->OnMediaInterrupted(player_id());
-}
-
-void MediaPlayerBridge::OnSeekComplete() {
- manager()->OnSeekComplete(player_id(), GetCurrentTime());
+ MediaPlayerAndroid::OnMediaInterrupted();
}
void MediaPlayerBridge::OnMediaPrepared() {

Powered by Google App Engine
This is Rietveld 408576698