Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix HAVE_METADATA and HAVE_CURRENT_DATA state transitions

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-09-25 07:11:05 +02:00
parent dba61ad1df
commit 1c92240310
2 changed files with 43 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

75
components/script/dom/htmlmediaelement.rs
View file

@ -510,6 +510,7 @@ impl HTMLMediaElement {
// https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm // https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm
fn invoke_resource_selection_algorithm(&self) { fn invoke_resource_selection_algorithm(&self) {
println!("invoke_resource_selection_algorithm");
// Step 1. // Step 1.
self.network_state.set(NetworkState::NoSource); self.network_state.set(NetworkState::NoSource);
@ -541,6 +542,7 @@ impl HTMLMediaElement {
// https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm // https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm
fn resource_selection_algorithm_sync(&self, base_url: ServoUrl) { fn resource_selection_algorithm_sync(&self, base_url: ServoUrl) {
println!("resource_selection_algorithm_sync");
// Step 5. // Step 5.
// FIXME(ferjm): Implement blocked_on_parser logic // FIXME(ferjm): Implement blocked_on_parser logic
// https://html.spec.whatwg.org/multipage/#blocked-on-parser // https://html.spec.whatwg.org/multipage/#blocked-on-parser
@ -641,6 +643,7 @@ impl HTMLMediaElement {
// https://html.spec.whatwg.org/multipage/#concept-media-load-resource // https://html.spec.whatwg.org/multipage/#concept-media-load-resource
fn resource_fetch_algorithm(&self, resource: Resource) { fn resource_fetch_algorithm(&self, resource: Resource) {
println!("resource_fetch_algorithm");
// Steps 1-2. // Steps 1-2.
// Unapplicable, the `resource` variable already conveys which mode // Unapplicable, the `resource` variable already conveys which mode
// is in use. // is in use.
@ -706,7 +709,9 @@ impl HTMLMediaElement {
..RequestInit::default() ..RequestInit::default()
}; };
println!("Setting up media player");
self.setup_media_player(); self.setup_media_player();
println!("Media player setup");
let context = Arc::new(Mutex::new(HTMLMediaElementContext::new(self))); let context = Arc::new(Mutex::new(HTMLMediaElementContext::new(self)));
let (action_sender, action_receiver) = ipc::channel().unwrap(); let (action_sender, action_receiver) = ipc::channel().unwrap();
let window = window_from_node(self); let window = window_from_node(self);
@ -790,6 +795,7 @@ impl HTMLMediaElement {
// https://html.spec.whatwg.org/multipage/#media-element-load-algorithm // https://html.spec.whatwg.org/multipage/#media-element-load-algorithm
fn media_element_load_algorithm(&self) { fn media_element_load_algorithm(&self) {
println!("media_element_load_algorithm");
// Reset the flag that signals whether loadeddata was ever fired for // Reset the flag that signals whether loadeddata was ever fired for
// this invokation of the load algorithm. // this invokation of the load algorithm.
self.fired_loadeddata_event.set(false); self.fired_loadeddata_event.set(false);
@ -969,46 +975,42 @@ impl HTMLMediaElement {
fn handle_player_event(&self, event: &PlayerEvent) { fn handle_player_event(&self, event: &PlayerEvent) {
match *event { match *event {
PlayerEvent::MetadataUpdated(ref metadata) => { PlayerEvent::MetadataUpdated(ref metadata) => {
if !self.have_metadata.get() && metadata.duration.is_some() { println!("PlayerEvent::MetadataUpdated");
// https://html.spec.whatwg.org/multipage/#media-data-processing-steps-list // https://html.spec.whatwg.org/multipage/#media-data-processing-steps-list
// => "Once enough of the media data has been fetched to determine the duration..." // => "Once enough of the media data has been fetched to determine the duration..."
// Step 1. // Step 1.
// servo-media owns the media timeline. // servo-media owns the media timeline.
// Step 2. // Step 2.
// XXX(ferjm) Update the timeline offset. // XXX(ferjm) Update the timeline offset.
// Step 3. // Step 3.
// XXX(ferjm) Set the current and official playback positions // XXX(ferjm) Set the current and official playback positions
// to the earliest possible position. // to the earliest possible position.
// Step 4. // Step 4.
if let Some(duration) = metadata.duration { if let Some(duration) = metadata.duration {
self.duration.set(duration.as_secs() as f64); self.duration.set(duration.as_secs() as f64);
} else { } else {
self.duration.set(f64::INFINITY); self.duration.set(f64::INFINITY);
} }
let window = window_from_node(self); let window = window_from_node(self);
let task_source = window.dom_manipulation_task_source(); let task_source = window.dom_manipulation_task_source();
task_source.queue_simple_event(self.upcast(), atom!("durationchange"), &window); task_source.queue_simple_event(self.upcast(), atom!("durationchange"), &window);
// Step 5. // Step 5.
if self.is::<HTMLVideoElement>() { if self.is::<HTMLVideoElement>() {
let video_elem = self.downcast::<HTMLVideoElement>().unwrap(); let video_elem = self.downcast::<HTMLVideoElement>().unwrap();
video_elem.set_video_width(metadata.width); video_elem.set_video_width(metadata.width);
video_elem.set_video_height(metadata.height); video_elem.set_video_height(metadata.height);
task_source.queue_simple_event(self.upcast(), atom!("resize"), &window); task_source.queue_simple_event(self.upcast(), atom!("resize"), &window);
} }
// Step 6. // Step 6.
self.change_ready_state(ReadyState::HaveMetadata); self.change_ready_state(ReadyState::HaveMetadata);
self.have_metadata.set(true); self.have_metadata.set(true);
// XXX(ferjm) Steps 7 to 13. // XXX(ferjm) Steps 7 to 13.
} else {
// => set the element's delaying-the-load-event flag to false
self.change_ready_state(ReadyState::HaveCurrentData);
}
}, },
PlayerEvent::StateChanged(ref state) => match *state { PlayerEvent::StateChanged(ref state) => match *state {
PlaybackState::Paused => { PlaybackState::Paused => {
@ -1274,6 +1276,13 @@ impl FetchResponseListener for HTMLMediaElementContext {
return; return;
} }
// Make sure we don't skip the HaveMetadata state.
if elem.have_metadata.get() {
// https://html.spec.whatwg.org/multipage/#media-data-processing-steps-list
// => set the element's delaying-the-load-event flag to false
elem.change_ready_state(ReadyState::HaveCurrentData);
}
// https://html.spec.whatwg.org/multipage/#concept-media-load-resource step 4, // https://html.spec.whatwg.org/multipage/#concept-media-load-resource step 4,
// => "If mode is remote" step 2 // => "If mode is remote" step 2
if time::get_time() > self.next_progress_event { if time::get_time() > self.next_progress_event {

1
etc/ci/buildbot_steps.yml
View file

@ -3,6 +3,7 @@ env:
RUSTFLAGS: -Dwarnings RUSTFLAGS: -Dwarnings
CARGO_INCREMENTAL: "0" CARGO_INCREMENTAL: "0"
SCCACHE_IDLE_TIMEOUT: "1200" SCCACHE_IDLE_TIMEOUT: "1200"
GST_DEBUG: '3'
mac-rel-wpt1: mac-rel-wpt1:
- ./mach clean-nightlies --keep 3 --force - ./mach clean-nightlies --keep 3 --force