Choose size, rate and what follows when recording the editor
The editor recording had fixed settings: the canvas size at 60 fps,
always converted and imported. Recording in 4K needs a choice, and the
server shrank every video to 1080p anyway. Start recording... now opens
a dialog, and a recording always goes to the server as it is.
- The dialog holds name, resolution (Screen, 1080p, 1440p, 4K), fps
(60 or 30), mouse pointer, sound, Convert and Import after
conversion. Import is greyed out while Convert is off. The browser
keeps the last choice, not the name.
- A larger resolution makes the editor draw finer while it records,
so 4K is sharp, not stretched. It is never below the screen's own
resolution and goes back after Stop.
- Stop always uploads. Without Convert the file only stays on the
server. Without Import it is converted but no asset is added. Both
are found in the video picker.
- The server keeps the original next to each MP4 for every upload, so
Download in the video tab and the picker gives the original. Videos
from before have none, they still download their MP4.
- A file left unconverted shows in the picker as not converted, with
a Convert button. POST videos/{file}/convert queues it, and upload
takes convert=0.
- The worker now caps a video at 3840x2160 instead of 1920x1080. Videos
converted before stay as they are.
Tests:
- PHP videos.test.php: 81 checks green, with the original, convert=0,
a later Convert and the 4K cap.
- Unit recording: 5 new, green. Red without the rule that a recording
is never below the screen's resolution.
- e2e 67e-ii: the video tab downloads the .source.mkv, a Matroska
file. 67f: 1440p from a 1280x800 window gives 2304x1440 at 30 fps
without sound, kept and not imported, then converted in the picker.
Both red with the MP4 download and without the finer drawing.
- The README names 2045 e2e checks.
- Gate on melektaus-atx: 304 files, 4699 tests green.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
93190e185c
commit
ba01d146e9
26 files changed
+1011
-129
No files matched your search
+27
-12
@@ -2,15 +2,17 @@
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* The videos waiting to be converted (#402): `data/videos/queue/{folder}-{hash}.src` holds the
|
||||
* uploaded bytes, `{folder}-{hash}.json` what became of them. The API adds to it, the worker in the
|
||||
* The videos waiting to be converted (#402): `data/videos/queue/{folder}-{hash}.json` says what
|
||||
* became of an upload, and its `source` where the upload lies – kept as it came beside the MP4,
|
||||
* `{folder}/{hash}.source.{ext}`, for downloading it. The API adds to it, the worker in the
|
||||
* container `game-maker-video` takes from it, one at a time, oldest first.
|
||||
*
|
||||
* A job is `queued`, `converting` (with `progress` from 0 to 1) or `failed` (with `error`). A done
|
||||
* one is no job any more: its MP4 lies in the account's folder and the job is gone. A failed one
|
||||
* stays, so the picker can say why, until the file is deleted or uploaded again.
|
||||
*
|
||||
* Both files are hidden from the web server: the upload is not what anybody should be served.
|
||||
* A job from before the uploads were kept has no `source`: its bytes wait hidden in the queue as
|
||||
* `{folder}-{hash}.src` and go once they are converted.
|
||||
*/
|
||||
final class VideoQueue
|
||||
{
|
||||
@@ -27,7 +29,7 @@ final class VideoQueue
|
||||
|
||||
/**
|
||||
* Copies an upload into a temp file beside the jobs, never more than `$maxBytes` of it: a video
|
||||
* is too big to be held in memory. The caller hands the file to add() or deletes it.
|
||||
* is too big to be held in memory. The caller keeps the file or deletes it.
|
||||
*
|
||||
* @param resource $in
|
||||
* @throws VideoTooLargeException when the stream has more than `$maxBytes`
|
||||
@@ -48,15 +50,16 @@ final class VideoQueue
|
||||
return $tmp;
|
||||
}
|
||||
|
||||
/** Queues the upload received into `$upload`, which is moved and gone afterwards. */
|
||||
public function add(string $folder, string $hash, string $upload, string $name): void
|
||||
/**
|
||||
* Queues the upload kept at `$source`, a path inside the videos' directory such as
|
||||
* `{folder}/{hash}.source.mkv`. The upload stays where it is.
|
||||
*/
|
||||
public function add(string $folder, string $hash, string $source, string $name): void
|
||||
{
|
||||
if (!chmod($upload, AtomicFile::HIDDEN) || !rename($upload, $this->source($folder, $hash))) {
|
||||
throw new RuntimeException('Cannot write uploaded video');
|
||||
}
|
||||
$this->write($folder, $hash, [
|
||||
'folder' => $folder,
|
||||
'hash' => $hash,
|
||||
'source' => $source,
|
||||
'name' => $name,
|
||||
'state' => self::QUEUED,
|
||||
'progress' => 0,
|
||||
@@ -134,10 +137,11 @@ final class VideoQueue
|
||||
return $count;
|
||||
}
|
||||
|
||||
/** Drops the job, and an old one's hidden upload; a kept upload is the store's to delete. */
|
||||
public function remove(string $folder, string $hash): bool
|
||||
{
|
||||
$removed = false;
|
||||
foreach ([$this->source($folder, $hash), $this->jobPath($folder, $hash)] as $path) {
|
||||
foreach ([$this->hiddenUpload($folder, $hash), $this->jobPath($folder, $hash)] as $path) {
|
||||
if (is_file($path)) {
|
||||
$removed = unlink($path) || $removed;
|
||||
}
|
||||
@@ -145,16 +149,27 @@ final class VideoQueue
|
||||
return $removed;
|
||||
}
|
||||
|
||||
/** Drops the upload once it is converted or cannot be; the job itself says what happened. */
|
||||
/**
|
||||
* Drops an old job's hidden upload once it cannot be converted; the job itself says why. A kept
|
||||
* upload stays: it can still be downloaded as it came.
|
||||
*/
|
||||
public function dropSource(string $folder, string $hash): void
|
||||
{
|
||||
$path = $this->source($folder, $hash);
|
||||
$path = $this->hiddenUpload($folder, $hash);
|
||||
if (is_file($path)) {
|
||||
unlink($path);
|
||||
}
|
||||
}
|
||||
|
||||
/** Where the bytes of a job lie, for ffmpeg to read. */
|
||||
public function source(string $folder, string $hash): string
|
||||
{
|
||||
$source = (string) ($this->job($folder, $hash)['source'] ?? '');
|
||||
$kept = '#^' . UserStore::FOLDER_PATTERN . '/[a-f0-9]{64}\.source\.[a-z0-9]+$#';
|
||||
return preg_match($kept, $source) ? dirname($this->dir) . "/{$source}" : $this->hiddenUpload($folder, $hash);
|
||||
}
|
||||
|
||||
private function hiddenUpload(string $folder, string $hash): string
|
||||
{
|
||||
return "{$this->dir}/{$folder}-{$hash}.src";
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user