Skip to content

Enhancement: Better previews for HDR video #51712

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

Merged
sorbaugh merged 3 commits into from
Apr 7, 2025
Merged

Enhancement: Better previews for HDR video #51712

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3008d0
feat(previews): Use proper colorspace and apply tonemap for HDR videos
invario Mar 9, 2025
91e2f05
feat(previews): Clean up code for HDR video previews
invario Apr 3, 2025
eb3ca40
feat(previews): fix casing and comments
invario Apr 3, 2025
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
Prev Previous commit
Next Next commit
feat(previews): Clean up code for HDR video previews 
Signed-off-by: invario <[email protected]>
  • Loading branch information
@invario
invario committed Apr 3, 2025
commit 91e2f05ee6aeaa978fec953455d7fcab20a07900
26 changes: 10 additions & 16 deletions lib/private/Preview/Movie.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
use Psr\Log\LoggerInterface;

class Movie extends ProviderV2 {
/** @var IConfig */
private $config;
private Iconfig $config;

/**
* @deprecated 23.0.0 pass option to \OCP\Preview\ProviderV2
Expand All @@ -33,13 +32,9 @@ class Movie extends ProviderV2 {
/** @var string */
private $binary;

/**
* {@inheritDoc}
*/

public function __construct(array $config) {
parent::__construct($config);
$this->config = \OC::$server->get(IConfig::class);
$this->config = Server::get(IConfig::class);
}

public function getMimeType(): string {
Expand Down Expand Up @@ -117,22 +112,21 @@ public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {

private function useHdr(string $absPath): bool {
// load ffprobe path from configuration, otherwise generate binary path using ffmpeg binary path
$ffprobe_binary = $this->config->getSystemValue('preview_ffprobe_path', null) ?? pathinfo($this->binary, PATHINFO_DIRNAME) . '/ffprobe';
$ffprobe_binary = $this->config->getSystemValue('preview_ffprobe_path', null) ?? (pathinfo($this->binary, PATHINFO_DIRNAME) . '/ffprobe');
// run ffprobe on the video file to get value of "color_transfer"
$test_hdr_cmd = [$ffprobe_binary,'-select_streams', 'v:0',
'-show_entries', 'stream=color_transfer',
'-of', 'default=noprint_wrappers=1:nokey=1',
$absPath];
$test_hdr_proc = proc_open($test_hdr_cmd, [1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $test_hdr_pipes);
if (is_resource($test_hdr_proc)) {
$test_hdr_stdout = trim(stream_get_contents($test_hdr_pipes[1]));
$test_hdr_stderr = trim(stream_get_contents($test_hdr_pipes[2]));
proc_close($test_hdr_proc);
// search build options for libzimg (provides zscale filter)
$ffmpeg_libzimg_installed = strpos($test_hdr_stderr, '--enable-libzimg');
} else {
$ffmpeg_libzimg_installed = false;
if ($test_hdr_proc === false) {
return false;
}
$test_hdr_stdout = trim(stream_get_contents($test_hdr_pipes[1]));
$test_hdr_stderr = trim(stream_get_contents($test_hdr_pipes[2]));
proc_close($test_hdr_proc);
// search build options for libzimg (provides zscale filter)
$ffmpeg_libzimg_installed = strpos($test_hdr_stderr, '--enable-libzimg');
// Only values of "smpte2084" and "arib-std-b67" indicate an HDR video. Force colorspace to '2020_ncl'
// because some videos are tagged incorrectly as 'reserved' resulting in fail.
// Only return true if video is detected as HDR and libzimg is installed.
Expand Down
Loading