Do not set player EOS. Set input size only if it changes

1 files changed, 27 insertions, 12 deletions

diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index bbdea90dee9..141ad5c86be 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -45,7 +45,7 @@ use crate::script_thread::ScriptThread;
 use crate::task_source::TaskSource;
 use dom_struct::dom_struct;
 use headers_core::HeaderMapExt;
-use headers_ext::ContentLength;
+use headers_ext::{ContentLength, ContentRange};
 use html5ever::{LocalName, Prefix};
 use http::header::{self, HeaderMap, HeaderValue};
 use ipc_channel::ipc;
@@ -196,6 +196,8 @@ pub struct HTMLMediaElement {
     played: Rc<DomRefCell<TimeRangesContainer>>,
     /// https://html.spec.whatwg.org/multipage/#dom-media-texttracks
     text_tracks_list: MutNullableDom<TextTrackList>,
+    /// Expected content length of the media asset being fetched or played.
+    content_length: Cell<Option<u64>>,
 }
 
 /// <https://html.spec.whatwg.org/multipage/#dom-media-networkstate>
@@ -249,6 +251,7 @@ impl HTMLMediaElement {
             resource_url: DomRefCell::new(None),
             played: Rc::new(DomRefCell::new(TimeRangesContainer::new())),
             text_tracks_list: Default::default(),
+            content_length: Cell::new(None),
         }
     }
 
@@ -1375,7 +1378,7 @@ impl HTMLMediaElementMethods for HTMLMediaElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-media-fastseek
     fn FastSeek(&self, time: Finite<f64>) {
-        self.seek(*time, /* approximat_for_speed */ true);
+        self.seek(*time, /* approximate_for_speed */ true);
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-media-played
@@ -1534,6 +1537,8 @@ impl FetchResponseListener for HTMLMediaElementContext {
     fn process_request_eof(&mut self) {}
 
     fn process_response(&mut self, metadata: Result<FetchMetadata, NetworkError>) {
+        let elem = self.elem.root();
+
         self.metadata = metadata.ok().map(|m| match m {
             FetchMetadata::Unfiltered(m) => m,
             FetchMetadata::Filtered { unsafe_, .. } => unsafe_,
@@ -1541,9 +1546,25 @@ impl FetchResponseListener for HTMLMediaElementContext {
 
         if let Some(metadata) = self.metadata.as_ref() {
             if let Some(headers) = metadata.headers.as_ref() {
-                if let Some(content_length) = headers.typed_get::<ContentLength>() {
-                    if let Err(e) = self.elem.root().player.set_input_size(content_length.0) {
-                        eprintln!("Could not set player input size {:?}", e);
+                // For range requests we get the size of the media asset from the Content-Range
+                // header. Otherwise, we get it from the Content-Length header.
+                let content_length =
+                    if let Some(content_range) = headers.typed_get::<ContentRange>() {
+                        content_range.bytes_len()
+                    } else if let Some(content_length) = headers.typed_get::<ContentLength>() {
+                        Some(content_length.0)
+                    } else {
+                        None
+                    };
+
+                // We only set the expected input size if it changes.
+                if content_length != elem.content_length.get() {
+                    if let Some(content_length) = content_length {
+                        if let Err(e) = self.elem.root().player.set_input_size(content_length) {
+                            warn!("Could not set player input size {:?}", e);
+                        } else {
+                            elem.content_length.set(Some(content_length));
+                        }
                     }
                 }
             }
@@ -1560,7 +1581,6 @@ impl FetchResponseListener for HTMLMediaElementContext {
             // Ensure that the element doesn't receive any further notifications
             // of the aborted fetch.
             self.ignore_response = true;
-            let elem = self.elem.root();
             elem.fetch_canceller.borrow_mut().cancel();
             elem.queue_dedicated_media_source_failure_steps();
         }
@@ -1598,13 +1618,8 @@ impl FetchResponseListener for HTMLMediaElementContext {
             // An error was received previously, skip processing the payload.
             return;
         }
-        let elem = self.elem.root();
-
-        // Signal the eos to player.
-        if let Err(e) = elem.player.end_of_stream() {
-            eprintln!("Could not signal EOS to player {:?}", e);
-        }
 
+        let elem = self.elem.root();
         if status.is_ok() {
             if elem.ready_state.get() == ReadyState::HaveNothing {
                 // Make sure that we don't skip the HaveMetadata and HaveCurrentData