| 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 "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
| 10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 } | 35 } |
| 36 | 36 |
| 37 GURL MediaPlayerAndroid::GetUrl() { | 37 GURL MediaPlayerAndroid::GetUrl() { |
| 38 return GURL(); | 38 return GURL(); |
| 39 } | 39 } |
| 40 | 40 |
| 41 GURL MediaPlayerAndroid::GetFirstPartyForCookies() { | 41 GURL MediaPlayerAndroid::GetFirstPartyForCookies() { |
| 42 return GURL(); | 42 return GURL(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 void MediaPlayerAndroid::SetCdm(BrowserCdm* /* cdm */) { | 45 void MediaPlayerAndroid::SetCdm(const scoped_refptr<MediaKeys>& /* cdm */) { |
| 46 // Players that support EME should override this. | 46 // Players that support EME should override this. |
| 47 LOG(ERROR) << "EME not supported on base MediaPlayerAndroid class."; | 47 LOG(ERROR) << "EME not supported on base MediaPlayerAndroid class."; |
| 48 return; | 48 return; |
| 49 } | 49 } |
| 50 | 50 |
| 51 void MediaPlayerAndroid::OnVideoSizeChanged(int width, int height) { | 51 void MediaPlayerAndroid::OnVideoSizeChanged(int width, int height) { |
| 52 manager_->OnVideoSizeChanged(player_id(), width, height); | 52 manager_->OnVideoSizeChanged(player_id(), width, height); |
| 53 } | 53 } |
| 54 | 54 |
| 55 void MediaPlayerAndroid::OnMediaError(int error_type) { | 55 void MediaPlayerAndroid::OnMediaError(int error_type) { |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 void MediaPlayerAndroid::DestroyListenerOnUIThread() { | 88 void MediaPlayerAndroid::DestroyListenerOnUIThread() { |
| 89 weak_factory_.InvalidateWeakPtrs(); | 89 weak_factory_.InvalidateWeakPtrs(); |
| 90 listener_.reset(); | 90 listener_.reset(); |
| 91 } | 91 } |
| 92 | 92 |
| 93 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() { | 93 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() { |
| 94 return weak_factory_.GetWeakPtr(); | 94 return weak_factory_.GetWeakPtr(); |
| 95 } | 95 } |
| 96 | 96 |
| 97 } // namespace media | 97 } // namespace media |
| OLD | NEW |