| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "media/base/android/media_player_android.h" | 5 #include "media/base/android/media_player_android.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/android/context_utils.h" | |
| 10 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
| 11 #include "base/logging.h" | 10 #include "base/logging.h" |
| 12 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
| 14 #include "media/base/android/media_drm_bridge.h" | 13 #include "media/base/android/media_drm_bridge.h" |
| 15 #include "media/base/android/media_player_manager.h" | 14 #include "media/base/android/media_player_manager.h" |
| 16 | 15 |
| 17 using base::android::JavaRef; | 16 using base::android::JavaRef; |
| 18 | 17 |
| 19 namespace { | 18 namespace { |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 } | 102 } |
| 104 | 103 |
| 105 void MediaPlayerAndroid::OnSeekComplete() { | 104 void MediaPlayerAndroid::OnSeekComplete() { |
| 106 manager_->OnSeekComplete(player_id(), GetCurrentTime()); | 105 manager_->OnSeekComplete(player_id(), GetCurrentTime()); |
| 107 } | 106 } |
| 108 | 107 |
| 109 void MediaPlayerAndroid::OnMediaPrepared() {} | 108 void MediaPlayerAndroid::OnMediaPrepared() {} |
| 110 | 109 |
| 111 void MediaPlayerAndroid::AttachListener( | 110 void MediaPlayerAndroid::AttachListener( |
| 112 const JavaRef<jobject>& j_media_player) { | 111 const JavaRef<jobject>& j_media_player) { |
| 113 listener_->CreateMediaPlayerListener(base::android::GetApplicationContext(), | 112 listener_->CreateMediaPlayerListener(j_media_player); |
| 114 j_media_player); | |
| 115 } | 113 } |
| 116 | 114 |
| 117 void MediaPlayerAndroid::DetachListener() { | 115 void MediaPlayerAndroid::DetachListener() { |
| 118 listener_->ReleaseMediaPlayerListenerResources(); | 116 listener_->ReleaseMediaPlayerListenerResources(); |
| 119 } | 117 } |
| 120 | 118 |
| 121 void MediaPlayerAndroid::DestroyListenerOnUIThread() { | 119 void MediaPlayerAndroid::DestroyListenerOnUIThread() { |
| 122 weak_factory_.InvalidateWeakPtrs(); | 120 weak_factory_.InvalidateWeakPtrs(); |
| 123 listener_.reset(); | 121 listener_.reset(); |
| 124 } | 122 } |
| 125 | 123 |
| 126 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() { | 124 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() { |
| 127 return weak_factory_.GetWeakPtr(); | 125 return weak_factory_.GetWeakPtr(); |
| 128 } | 126 } |
| 129 | 127 |
| 130 } // namespace media | 128 } // namespace media |
| OLD | NEW |