alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 09:34:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Simplify the way we choose our ffmpeg

Browse Source 
* no longer search $PATH
* no longer require a full path
* don't fall back
This commit is contained in:
Bond_009
2021-04-04 23:02:28 +02:00
parent 32a11c006d
commit 963ab2dab6
6 changed files with 39 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs
View File

@@ -9,12 +9,13 @@ namespace Jellyfin.MediaEncoding.Tests
{
public class EncoderValidatorTests
{
private readonly EncoderValidator _encoderValidator = new EncoderValidator(new NullLogger<EncoderValidatorTests>(), "ffmpeg");
[Theory]
[ClassData(typeof(GetFFmpegVersionTestData))]
public void GetFFmpegVersionTest(string versionOutput, Version? version)
{
var val = new EncoderValidator(new NullLogger<EncoderValidatorTests>());
Assert.Equal(version, val.GetFFmpegVersion(versionOutput));
Assert.Equal(version, _encoderValidator.GetFFmpegVersion(versionOutput));
}
[Theory]
@@ -28,8 +29,7 @@ namespace Jellyfin.MediaEncoding.Tests
[InlineData(EncoderValidatorTestsData.FFmpegGitUnknownOutput, false)]
public void ValidateVersionInternalTest(string versionOutput, bool valid)
{
var val = new EncoderValidator(new NullLogger<EncoderValidatorTests>());
Assert.Equal(valid, val.ValidateVersionInternal(versionOutput));
Assert.Equal(valid, _encoderValidator.ValidateVersionInternal(versionOutput));
}
private class GetFFmpegVersionTestData : IEnumerable<object?[]>