upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 37

chore(Preview): Remove avconv support

Browse source 
Signed-off-by: provokateurin <kate@provokateurin.de>
This commit is contained in:
provokateurin 2025-08-27 20:50:45 +02:00
parent 4111bdbbcf
commit 4b2a93cf0a
No known key found for this signature in database
4 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/config.sample.php
View file

@ -1429,7 +1429,7 @@ $CONFIG = [
/**
* Custom path for ffmpeg binary
*
* Defaults to ``null`` and falls back to searching ``avconv`` and ``ffmpeg``
* Defaults to ``null`` and falls back to searching ``ffmpeg``
* in the configured ``PATH`` environment
*/
'preview_ffmpeg_path' => '/usr/bin/ffmpeg',

7
lib/private/Preview/Movie.php
View file

@ -135,12 +135,7 @@ class Movie extends ProviderV2 {
$binaryType = substr(strrchr($this->binary, '/'), 1);
if ($binaryType === 'avconv') {
$cmd = [$this->binary, '-y', '-ss', (string)$second,
'-i', $absPath,
'-an', '-f', 'mjpeg', '-vframes', '1', '-vsync', '1',
$tmpPath];
} elseif ($binaryType === 'ffmpeg') {
if ($binaryType === 'ffmpeg') {
if ($this->useHdr($absPath)) {
// Force colorspace to '2020_ncl' because some videos are
// tagged incorrectly as 'reserved' resulting in fail if not forced.

7
lib/private/PreviewManager.php
View file

@ -373,14 +373,11 @@ class PreviewManager implements IPreview {
$this->registerCoreProvidersOffice();
// Video requires avconv or ffmpeg
// Video requires ffmpeg
if (in_array(Preview\Movie::class, $this->getEnabledDefaultProvider())) {
$movieBinary = $this->config->getSystemValue('preview_ffmpeg_path', null);
if (!is_string($movieBinary)) {
$movieBinary = $this->binaryFinder->findBinaryPath('avconv');
if (!is_string($movieBinary)) {
$movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg');
}
$movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg');
}

5
tests/lib/Preview/MovieTest.php
View file

@ -26,10 +26,7 @@ class MovieTest extends Provider {
protected function setUp(): void {
$binaryFinder = Server::get(IBinaryFinder::class);
$movieBinary = $binaryFinder->findBinaryPath('avconv');
if (!is_string($movieBinary)) {
$movieBinary = $binaryFinder->findBinaryPath('ffmpeg');
}
$movieBinary = $binaryFinder->findBinaryPath('ffmpeg');
if (is_string($movieBinary)) {
parent::setUp();