| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "content/renderer/media/android/webmediaplayer_android.h" | 5 #include "content/renderer/media/android/webmediaplayer_android.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <limits> | 9 #include <limits> |
| 10 | 10 |
| (...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 911 UpdatePlayingState(true); | 911 UpdatePlayingState(true); |
| 912 client_->playbackStateChanged(); | 912 client_->playbackStateChanged(); |
| 913 } | 913 } |
| 914 | 914 |
| 915 void WebMediaPlayerAndroid::OnMediaPlayerPause() { | 915 void WebMediaPlayerAndroid::OnMediaPlayerPause() { |
| 916 UpdatePlayingState(false); | 916 UpdatePlayingState(false); |
| 917 client_->playbackStateChanged(); | 917 client_->playbackStateChanged(); |
| 918 } | 918 } |
| 919 | 919 |
| 920 void WebMediaPlayerAndroid::OnRemoteRouteAvailabilityChanged( | 920 void WebMediaPlayerAndroid::OnRemoteRouteAvailabilityChanged( |
| 921 bool routes_available) { | 921 bool is_route_available, bool is_source_compatible) { |
| 922 client_->remoteRouteAvailabilityChanged(routes_available); | 922 client_->remoteRouteAvailabilityChanged( |
| 923 is_route_available, is_source_compatible); |
| 923 } | 924 } |
| 924 | 925 |
| 925 void WebMediaPlayerAndroid::UpdateNetworkState( | 926 void WebMediaPlayerAndroid::UpdateNetworkState( |
| 926 WebMediaPlayer::NetworkState state) { | 927 WebMediaPlayer::NetworkState state) { |
| 927 DCHECK(main_thread_checker_.CalledOnValidThread()); | 928 DCHECK(main_thread_checker_.CalledOnValidThread()); |
| 928 if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing && | 929 if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing && |
| 929 (state == WebMediaPlayer::NetworkStateNetworkError || | 930 (state == WebMediaPlayer::NetworkStateNetworkError || |
| 930 state == WebMediaPlayer::NetworkStateDecodeError)) { | 931 state == WebMediaPlayer::NetworkStateDecodeError)) { |
| 931 // Any error that occurs before reaching ReadyStateHaveMetadata should | 932 // Any error that occurs before reaching ReadyStateHaveMetadata should |
| 932 // be considered a format error. | 933 // be considered a format error. |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1319 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 1320 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 1320 switches::kDisableMediaSuspend)) { | 1321 switches::kDisableMediaSuspend)) { |
| 1321 return false; | 1322 return false; |
| 1322 } | 1323 } |
| 1323 | 1324 |
| 1324 return base::FeatureList::IsEnabled(media::kResumeBackgroundVideo) && | 1325 return base::FeatureList::IsEnabled(media::kResumeBackgroundVideo) && |
| 1325 hasAudio() && !isRemote() && delegate_ && delegate_->IsHidden(); | 1326 hasAudio() && !isRemote() && delegate_ && delegate_->IsHidden(); |
| 1326 } | 1327 } |
| 1327 | 1328 |
| 1328 } // namespace content | 1329 } // namespace content |
| OLD | NEW |