| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_bridge.h" | 5 #include "media/base/android/media_player_bridge.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 // is available. | 27 // is available. |
| 28 static const int kTemporaryDuration = 100; | 28 static const int kTemporaryDuration = 100; |
| 29 | 29 |
| 30 namespace media { | 30 namespace media { |
| 31 | 31 |
| 32 #if !defined(GOOGLE_TV) | 32 #if !defined(GOOGLE_TV) |
| 33 // static | 33 // static |
| 34 MediaPlayerAndroid* MediaPlayerAndroid::Create( | 34 MediaPlayerAndroid* MediaPlayerAndroid::Create( |
| 35 int player_id, | 35 int player_id, |
| 36 const GURL& url, | 36 const GURL& url, |
| 37 bool is_media_source, | 37 SourceType source_type, |
| 38 const GURL& first_party_for_cookies, | 38 const GURL& first_party_for_cookies, |
| 39 bool hide_url_log, | 39 bool hide_url_log, |
| 40 MediaPlayerManager* manager) { | 40 MediaPlayerManager* manager) { |
| 41 LOG_IF(WARNING, is_media_source) << "MSE is not supported"; | 41 DCHECK_EQ(source_type, SOURCE_TYPE_URL) |
| 42 << "Media source other than URL is not supported."; |
| 42 return new MediaPlayerBridge( | 43 return new MediaPlayerBridge( |
| 43 player_id, | 44 player_id, url, first_party_for_cookies, hide_url_log, manager); |
| 44 url, | |
| 45 first_party_for_cookies, | |
| 46 hide_url_log, | |
| 47 manager); | |
| 48 } | 45 } |
| 49 #endif | 46 #endif |
| 50 | 47 |
| 51 MediaPlayerBridge::MediaPlayerBridge( | 48 MediaPlayerBridge::MediaPlayerBridge( |
| 52 int player_id, | 49 int player_id, |
| 53 const GURL& url, | 50 const GURL& url, |
| 54 const GURL& first_party_for_cookies, | 51 const GURL& first_party_for_cookies, |
| 55 bool hide_url_log, | 52 bool hide_url_log, |
| 56 MediaPlayerManager* manager) | 53 MediaPlayerManager* manager) |
| 57 : MediaPlayerAndroid(player_id, | 54 : MediaPlayerAndroid(player_id, |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 | 402 |
| 406 bool MediaPlayerBridge::CanSeekBackward() { | 403 bool MediaPlayerBridge::CanSeekBackward() { |
| 407 return can_seek_backward_; | 404 return can_seek_backward_; |
| 408 } | 405 } |
| 409 | 406 |
| 410 bool MediaPlayerBridge::IsPlayerReady() { | 407 bool MediaPlayerBridge::IsPlayerReady() { |
| 411 return prepared_; | 408 return prepared_; |
| 412 } | 409 } |
| 413 | 410 |
| 414 } // namespace media | 411 } // namespace media |
| OLD | NEW |