diff options
| -rw-r--r-- | .reuse/dep5 | 2 | ||||
| -rw-r--r-- | lib/private/Preview/Movie.php | 2 | ||||
| -rw-r--r-- | tests/data/broken-video.webm | bin | 0 -> 1714189 bytes | |||
| -rw-r--r-- | tests/lib/Preview/MovieBrokenStuckFfmpegTest.php | 20 | ||||
| -rw-r--r-- | tests/lib/Preview/MovieTest.php | 9 |
5 files changed, 27 insertions, 6 deletions
diff --git a/.reuse/dep5 b/.reuse/dep5 index 4abe782fb68..162fe0a5517 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -107,7 +107,7 @@ Files: tests/data/integritycheck/htaccessWithValidModifiedContent/.htaccess Copyright: 2016 ownCloud, Inc., 2019 Nextcloud GmbH and Nextcloud contributors License: AGPL-3.0-only -Files: core/img/favicon*.* core/img/logo/logo*.* tests/data/testimage.webp apps/testing/img/logo.png core/img/apps/spreed.svg +Files: core/img/favicon*.* core/img/logo/logo*.* tests/data/testimage.webp tests/data/broken-video.webm apps/testing/img/logo.png core/img/apps/spreed.svg Copyright: 2016-2024 Nextcloud GmbH License: LicenseRef-NextcloudTrademarks diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 7de543198f4..47895f999d8 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -166,8 +166,8 @@ class Movie extends ProviderV2 { $returnCode = -1; $output = ''; if (is_resource($proc)) { - $stdout = trim(stream_get_contents($pipes[1])); $stderr = trim(stream_get_contents($pipes[2])); + $stdout = trim(stream_get_contents($pipes[1])); $returnCode = proc_close($proc); $output = $stdout . $stderr; } diff --git a/tests/data/broken-video.webm b/tests/data/broken-video.webm Binary files differnew file mode 100644 index 00000000000..0cafb9314f8 --- /dev/null +++ b/tests/data/broken-video.webm diff --git a/tests/lib/Preview/MovieBrokenStuckFfmpegTest.php b/tests/lib/Preview/MovieBrokenStuckFfmpegTest.php new file mode 100644 index 00000000000..e66d5e64649 --- /dev/null +++ b/tests/lib/Preview/MovieBrokenStuckFfmpegTest.php @@ -0,0 +1,20 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace Test\Preview; + +/** + * Class MovieTest + * + * @group DB + * + * @package Test\Preview + */ +class MovieBrokenStuckFfmpegTest extends MovieTest { + protected string $fileName = 'broken-video.webm'; +} diff --git a/tests/lib/Preview/MovieTest.php b/tests/lib/Preview/MovieTest.php index b8946ad4c5e..6009943b89d 100644 --- a/tests/lib/Preview/MovieTest.php +++ b/tests/lib/Preview/MovieTest.php @@ -18,6 +18,10 @@ use OCP\Server; * @package Test\Preview */ class MovieTest extends Provider { + protected string $fileName = 'testimage.mp4'; + protected int $width = 560; + protected int $height = 320; + protected function setUp(): void { $binaryFinder = Server::get(IBinaryFinder::class); $movieBinary = $binaryFinder->findBinaryPath('avconv'); @@ -28,10 +32,7 @@ class MovieTest extends Provider { if (is_string($movieBinary)) { parent::setUp(); - $fileName = 'testimage.mp4'; - $this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName); - $this->width = 560; - $this->height = 320; + $this->imgPath = $this->prepareTestFile($this->fileName, \OC::$SERVERROOT . '/tests/data/' . $this->fileName); $this->provider = new \OC\Preview\Movie(['movieBinary' => $movieBinary]); } else { $this->markTestSkipped('No Movie provider present'); |