eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-05-01 20:17:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Verify and use the response's Content-Range in HTMLMediaElement

Browse Source 
Using the response's header over our own request's byte range is likely
to be a little more reliable for piecing the data together in the
stream, in case the server decides to give us a slightly different
range than we requested. The media element spec requires that the
Content-Range parses correctly anyway, so we should make use of the
values we get out of it.
This commit is contained in:
Zaggy1024
2026-01-08 17:26:10 -06:00
committed by Gregory Bertilson
parent 99020b50a3
commit 7ede4e8b03
Notes: github-actions[bot] 2026-02-06 10:55:52 +00:00 
Author: https://github.com/Zaggy1024
Commit: https://github.com/LadybirdBrowser/ladybird/commit/7ede4e8b03f
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/7473
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Libraries/LibWeb/HTML/HTMLMediaElement.cpp
View File

@@ -1098,7 +1098,7 @@ void HTMLMediaElement::fetch_resource(NonnullRefPtr<FetchData> const& fetch_data
// 4. If the result of verifying response given the current media resource and byteRange is false, then abort these steps.
// NOTE: We do this step before creating the updateMedia task so that we can invoke the failure callback.
auto maybe_verify_response_failure = verify_response_or_get_failure_reason(response, byte_range);
auto maybe_verify_response_failure = verify_response_or_get_failure_reason(response, byte_range, fetch_data);
if (maybe_verify_response_failure.has_value()) {
fetch_data->failure_callback(maybe_verify_response_failure.value());
return;
@@ -1166,7 +1166,7 @@ void HTMLMediaElement::fetch_resource(NonnullRefPtr<FetchData> const& fetch_data
}
// https://html.spec.whatwg.org/multipage/media.html#verify-a-media-response
Optional<String> HTMLMediaElement::verify_response_or_get_failure_reason(GC::Ref<Fetch::Infrastructure::Response> response, ByteRange const& byte_range)
Optional<String> HTMLMediaElement::verify_response_or_get_failure_reason(GC::Ref<Fetch::Infrastructure::Response> response, ByteRange const& byte_range, NonnullRefPtr<FetchData> const& fetch_data)
{
// 1. If response is a network error, then return false.
if (response->is_network_error()) {
@@ -1190,10 +1190,15 @@ Optional<String> HTMLMediaElement::verify_response_or_get_failure_reason(GC::Ref
return MUST(String::formatted("Unexpected status code: {}", internal_response->status()));
// 6. If the result of extracting content-range values from internalResponse is failure, then return false.
auto maybe_content_range = internal_response->header_list()->get("Content-Range"sv);
// FIXME: Implement the content-range extraction algorithm.
if (!maybe_content_range.has_value())
return "Response did not have a Content-Range header"_string;
auto maybe_content_range = internal_response->header_list()->extract_content_range_values();
if (!maybe_content_range.has<HTTP::HeaderList::ContentRangeValues>())
return MUST(String::formatted("Failed to extract values from Content-Range: {}", internal_response->header_list()->get("Content-Range"sv)));
auto const& content_range = maybe_content_range.get<HTTP::HeaderList::ContentRangeValues>();
fetch_data->offset = content_range.first_byte_pos;
if (content_range.complete_length.has_value())
fetch_data->stream->set_expected_size(content_range.complete_length.value());
return {};
}