sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: unbloc ffmpeg on some broken videos 

Co-authored-by: Joas Schilling <coding@schilljs.com>

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
pull/53430/head
Arthur Schiwon 2025-05-20 18:14:30 +07:00
parent 33805b8d69
commit cc4699aea1
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.reuse/dep5
Unescape Escape View File

@ -107,7 +107,7 @@ Files: tests/data/integritycheck/htaccessWithValidModifiedContent/.htaccess
Copyright: 2016 ownCloud, Inc., 2019 Nextcloud GmbH and Nextcloud contributors Copyright: 2016 ownCloud, Inc., 2019 Nextcloud GmbH and Nextcloud contributors
License: AGPL-3.0-only 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 Copyright: 2016-2024 Nextcloud GmbH
License: LicenseRef-NextcloudTrademarks License: LicenseRef-NextcloudTrademarks

2
lib/private/Preview/Movie.php
Unescape Escape View File

@ -122,8 +122,8 @@ class Movie extends ProviderV2 {
$returnCode = -1; $returnCode = -1;
$output = ''; $output = '';
if (is_resource($proc)) { if (is_resource($proc)) {
$stdout = trim(stream_get_contents($pipes[1]));
$stderr = trim(stream_get_contents($pipes[2])); $stderr = trim(stream_get_contents($pipes[2]));
$stdout = trim(stream_get_contents($pipes[1]));
$returnCode = proc_close($proc); $returnCode = proc_close($proc);
$output = $stdout . $stderr; $output = $stdout . $stderr;
} }

BIN
tests/data/broken-video.webm
View File

Binary file not shown.

20
tests/lib/Preview/MovieBrokenStuckFfmpegTest.php
Unescape Escape View File

@ -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';
}

9
tests/lib/Preview/MovieTest.php
Unescape Escape View File

@ -16,6 +16,10 @@ namespace Test\Preview;
* @package Test\Preview * @package Test\Preview
*/ */
class MovieTest extends Provider { class MovieTest extends Provider {
protected string $fileName = 'testimage.mp4';
protected $width = 560;
protected $height = 320;
protected function setUp(): void { protected function setUp(): void {
$avconvBinary = \OC_Helper::findBinaryPath('avconv'); $avconvBinary = \OC_Helper::findBinaryPath('avconv');
$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg'); $ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
@ -26,10 +30,7 @@ class MovieTest extends Provider {
\OC\Preview\Movie::$avconvBinary = $avconvBinary; \OC\Preview\Movie::$avconvBinary = $avconvBinary;
\OC\Preview\Movie::$ffmpegBinary = $ffmpegBinary; \OC\Preview\Movie::$ffmpegBinary = $ffmpegBinary;
$fileName = 'testimage.mp4'; $this->imgPath = $this->prepareTestFile($this->fileName, \OC::$SERVERROOT . '/tests/data/' . $this->fileName);
$this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName);
$this->width = 560;
$this->height = 320;
$this->provider = new \OC\Preview\Movie; $this->provider = new \OC\Preview\Movie;
} else { } else {
$this->markTestSkipped('No Movie provider present'); $this->markTestSkipped('No Movie provider present');