Chromium Code Reviews| Index: content/renderer/media/webmediaplayer_ms.cc |
| diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc |
| index ecb27e684afc18d5af4752ee921830e7c0ca17ac..229ad6f42b7d4fd6c5873b4eb3ff628a6dc565d5 100644 |
| --- a/content/renderer/media/webmediaplayer_ms.cc |
| +++ b/content/renderer/media/webmediaplayer_ms.cc |
| @@ -181,12 +181,16 @@ void WebMediaPlayerMS::play() { |
| audio_renderer_->Play(); |
| if (delegate_) { |
| - // TODO(perkj, magjed): We send a duration of 1 second here to avoid |
| - // creating an interactive media session on Android. We'd like to use zero |
| - // here, but that is treated as an unknown duration and assumed to be |
| - // interactive. See http://crbug.com/595297 for more details. |
| + // TODO(perkj, magjed): We use Uncontrollable type here to avoid creating an |
| + // interactive media session on Android. See http://crbug.com/596516 for |
| + // more details. |
| +#if defined(OS_ANDROID) |
| delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false, |
| media::MediaContentType::Uncontrollable); |
| +#else // defined(OS_ANDROID) |
| + delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false, |
| + media::MediaContentType::Persistent); |
| +#endif // defined(OS_ANDROID) |
| } |
| paused_ = false; |
| @@ -450,8 +454,7 @@ void WebMediaPlayerMS::OnPause() { |
| } |
| void WebMediaPlayerMS::OnVolumeMultiplierUpdate(double multiplier) { |
| - volume_multiplier_ = multiplier; |
| - setVolume(volume_); |
| + // TODO(perkj, magjed): See TODO in Onplay(). |
|
DaleCurtis
2016/10/20 21:04:41
OnPlay(), fix one on l.453 too?
Zhiqiang Zhang (Slow)
2016/10/20 21:30:31
Done.
|
| } |
| bool WebMediaPlayerMS::copyVideoTextureToPlatformTexture( |