Skip to content

Commit

Permalink
implement MediaSession.setPositionState method
Browse files Browse the repository at this point in the history
  • Loading branch information
shnmorimoto committed Dec 2, 2019
1 parent 83bb967 commit 274d4d2
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 2 deletions.
12 changes: 12 additions & 0 deletions components/script/dom/htmlmediaelement.rs
Expand Up @@ -1925,6 +1925,18 @@ impl HTMLMediaElement {

media_session.send_event(event);
}

pub fn set_duration(&self, duration: f64) {
self.duration.set(duration);
}

pub fn reset(&self) {
if let Some(ref player) = *self.player.borrow() {
if let Err(e) = player.lock().unwrap().stop() {
eprintln!("Could not stop player {:?}", e);
}
}
}
}

// XXX Placeholder for [https://github.com/servo/servo/issues/22293]
Expand Down
59 changes: 59 additions & 0 deletions components/script/dom/mediasession.rs
Expand Up @@ -9,10 +9,13 @@ use crate::dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaE
use crate::dom::bindings::codegen::Bindings::MediaMetadataBinding::MediaMetadataInit;
use crate::dom::bindings::codegen::Bindings::MediaMetadataBinding::MediaMetadataMethods;
use crate::dom::bindings::codegen::Bindings::MediaSessionBinding;
use crate::dom::bindings::codegen::Bindings::MediaSessionBinding::MediaPositionState;
use crate::dom::bindings::codegen::Bindings::MediaSessionBinding::MediaSessionAction;
use crate::dom::bindings::codegen::Bindings::MediaSessionBinding::MediaSessionActionHandler;
use crate::dom::bindings::codegen::Bindings::MediaSessionBinding::MediaSessionMethods;
use crate::dom::bindings::codegen::Bindings::MediaSessionBinding::MediaSessionPlaybackState;
use crate::dom::bindings::error::{Error, Fallible};
use crate::dom::bindings::num::Finite;
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::{DomRoot, MutNullableDom};
use crate::dom::bindings::str::DOMString;
Expand Down Expand Up @@ -194,6 +197,62 @@ impl MediaSessionMethods for MediaSession {
None => self.action_handlers.borrow_mut().remove(&action.into()),
};
}

/// https://w3c.github.io/mediasession/#dom-mediasession-setpositionstate
fn SetPositionState(&self, state: &MediaPositionState) -> Fallible<()> {
// If the state is an empty dictionary then clear the position state.
if state.duration.is_none() && state.position.is_none() && state.playbackRate.is_none() {
if let Some(media_instance) = self.media_instance.get() {
media_instance.reset();
}
return Ok(());
}

// If the duration is not present or its value is null, throw a TypeError.
if state.duration.is_none() {
return Err(Error::Type(
"duration is not present or its value is null".to_owned(),
));
}

// If the duration is negative, throw a TypeError.
if let Some(state_duration) = state.duration {
if *state_duration < 0.0 {
return Err(Error::Type("duration is negative".to_owned()));
}
}

// If the position is negative or greater than duration, throw a TypeError.
if let Some(state_position) = state.position {
if *state_position < 0.0 {
return Err(Error::Type("position is negative".to_owned()));
}
if let Some(state_duration) = state.duration {
if *state_position > *state_duration {
return Err(Error::Type("position is greater than duration".to_owned()));
}
}
}

// If the playbackRate is zero throw a TypeError.
if let Some(state_playback_rate) = state.playbackRate {
if *state_playback_rate <= 0.0 {
return Err(Error::Type("playbackRate is zero".to_owned()));
}
}

// Update the position state and last position updated time.
if let Some(media_instance) = self.media_instance.get() {
media_instance.set_duration(state.duration.map(|v| *v).unwrap());
// If the playbackRate is not present or its value is null, set it to 1.0.
let _ =
media_instance.SetPlaybackRate(state.playbackRate.unwrap_or(Finite::wrap(1.0)))?;
// If the position is not present or its value is null, set it to zero.
media_instance.SetCurrentTime(state.position.unwrap_or(Finite::wrap(0.0)));
}

Ok(())
}
}

impl From<MediaSessionAction> for MediaSessionActionType {
Expand Down
9 changes: 7 additions & 2 deletions components/script/dom/webidls/MediaSession.webidl
Expand Up @@ -42,6 +42,12 @@ dictionary MediaSessionSeekToActionDetails : MediaSessionActionDetails {
boolean? fastSeek;
};

dictionary MediaPositionState {
double duration;
double playbackRate;
double position;
};

callback MediaSessionActionHandler = void(/*MediaSessionActionDetails details*/);

[Exposed=Window]
Expand All @@ -52,6 +58,5 @@ interface MediaSession {

void setActionHandler(MediaSessionAction action, MediaSessionActionHandler? handler);

//void setPositionState(optional MediaPositionState? state);
[Throws] void setPositionState(optional MediaPositionState state = {});
};

0 comments on commit 274d4d2

Please sign in to comment.