Index: content/renderer/media/android/webmediaplayer_android.cc |
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc |
index 068a13dbcd4cdb36e798e39e9cb0878a18899df7..671f3f1d34678f8a48ab67179213d32e02dfa92b 100644 |
--- a/content/renderer/media/android/webmediaplayer_android.cc |
+++ b/content/renderer/media/android/webmediaplayer_android.cc |
@@ -146,6 +146,7 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid( |
media_log_(media_log), |
web_cdm_(NULL), |
allow_stored_credentials_(false), |
+ is_local_resource_(false), |
weak_factory_(this) { |
DCHECK(player_manager_); |
DCHECK(cdm_manager_); |
@@ -216,6 +217,7 @@ void WebMediaPlayerAndroid::load(LoadType load_type, |
} |
url_ = url; |
+ is_local_resource_ = IsLocalResource(); |
int demuxer_client_id = 0; |
if (player_type_ != MEDIA_PLAYER_TYPE_URL) { |
RendererDemuxerAndroid* demuxer = |
@@ -277,6 +279,20 @@ void WebMediaPlayerAndroid::DidLoadMediaInfo( |
UpdateNetworkState(WebMediaPlayer::NetworkStateIdle); |
} |
+bool WebMediaPlayerAndroid::IsLocalResource() { |
+ if (url_.SchemeIsFile() || url_.SchemeIsBlob()) |
+ return true; |
+ |
+ if (url_.spec().find("//127.0.0.1/") != std::string::npos || // port 80 |
qinmin
2014/08/26 03:44:17
use:
std::string host = url_.host();
if (!host.c
amogh.bihani
2014/08/26 05:31:14
Done.
|
+ url_.spec().find("//localhost/") != std::string::npos || |
+ url_.spec().find("//127.0.0.1:") != std::string::npos || // any port |
+ url_.spec().find("//localhost:") != std::string::npos) { |
+ return true; |
+ } |
+ |
+ return false; |
+} |
+ |
void WebMediaPlayerAndroid::play() { |
DCHECK(main_thread_checker_.CalledOnValidThread()); |
#if defined(VIDEO_HOLE) |
@@ -679,7 +695,7 @@ void WebMediaPlayerAndroid::OnMediaMetadataChanged( |
DCHECK(main_thread_checker_.CalledOnValidThread()); |
bool need_to_signal_duration_changed = false; |
- if (url_.SchemeIs("file")) |
+ if (is_local_resource_) |
UpdateNetworkState(WebMediaPlayer::NetworkStateLoaded); |
// Update duration, if necessary, prior to ready state updates that may |
@@ -837,6 +853,8 @@ void WebMediaPlayerAndroid::OnVideoSizeChanged(int width, int height) { |
void WebMediaPlayerAndroid::OnTimeUpdate(const base::TimeDelta& current_time) { |
DCHECK(main_thread_checker_.CalledOnValidThread()); |
current_time_ = current_time.InSecondsF(); |
+ if (is_local_resource_ && current_time_ <= duration()) |
amogh.bihani
2014/08/22 09:02:45
I have used a bool instead of calling IsLocalResou
|
+ buffered_[0].end = current_time_; |
} |
void WebMediaPlayerAndroid::OnConnectedToRemoteDevice( |