Skip to content

Fix stuck loading on big video files #1697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Leszeg wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −6
Open

Fix stuck loading on big video files #1697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions lib/Controller/DownloadController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,34 @@ public function one(int $fileid, bool $resumable = true): Http\Response
if (!$resumable) {
$range = '';
}
// Get file reading parameters
$size = (int) $file->getSize();
$mimeType = $file->getMimeType();

// Get file reading parameters
$size = (int) $file->getSize();
[$seekStart, $seekEnd] = Util::explode_exact('-', $range, 2);
$seekEnd = (empty($seekEnd)) ? ($size - 1) : min(abs((int) $seekEnd), $size - 1);
$seekStart = (empty($seekStart) || $seekEnd < abs((int) $seekStart)) ? 0 : max(abs((int) $seekStart), 0);
[$seekStart, $seekEnd] = Util::explode_exact('-', $range, 2);

$rangeWasRequested = !empty($range);
$openEndedRange = $rangeWasRequested && '' === trim((string) $seekEnd);

// Workaround for browser video requests like "Range: bytes=0-".
// Without this limit, Memories may answer with the whole multi-GB file.
// The browser can request the next part or a seek position afterwards.
$maxVideoChunk = 32 * 1024 * 1024; // 32 MB

$seekStart = ('' === trim((string) $seekStart)) ? 0 : max(abs((int) $seekStart), 0);

if ($openEndedRange && 0 === strpos($mimeType, 'video/')) {
$seekEnd = min($seekStart + $maxVideoChunk - 1, $size - 1);
} else {
$seekEnd = ('' === trim((string) $seekEnd)) ? ($size - 1) : min(abs((int) $seekEnd), $size - 1);
}

if ($seekEnd < $seekStart) {
$seekStart = 0;
$seekEnd = $rangeWasRequested && 0 === strpos($mimeType, 'video/')
? min($maxVideoChunk - 1, $size - 1)
: ($size - 1);
}

// Only send partial content header if downloading a piece of the file
if ($seekStart > 0 || $seekEnd < ($size - 1)) {
Expand All @@ -161,7 +183,7 @@ public function one(int $fileid, bool $resumable = true): Http\Response

// Set headers
$out->setHeader('Content-Length: '.($seekEnd - $seekStart + 1));
$out->setHeader('Content-Type: '.$file->getMimeType());
$out->setHeader('Content-Type: '.$mimeType);

// Make sure the browser downloads the file
$filename = str_replace('"', '\"', $file->getName());
Expand Down