| 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..e0eb7edcb4b871f7b19b696369479d397f124d59 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;
|
| @@ -446,12 +450,11 @@ void WebMediaPlayerMS::OnPlay() {
|
| }
|
|
|
| void WebMediaPlayerMS::OnPause() {
|
| - // TODO(perkj, magjed): See TODO in Onplay().
|
| + // TODO(perkj, magjed): See TODO in OnPlay().
|
| }
|
|
|
| void WebMediaPlayerMS::OnVolumeMultiplierUpdate(double multiplier) {
|
| - volume_multiplier_ = multiplier;
|
| - setVolume(volume_);
|
| + // TODO(perkj, magjed): See TODO in OnPlay().
|
| }
|
|
|
| bool WebMediaPlayerMS::copyVideoTextureToPlatformTexture(
|
|
|