timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

use multiple docker tags again (#209)

Browse Source 
* Revert "disable framerate normalization (#208)"

This reverts commit 141a34933d.

* Revert "use linuxserver base docker image (#207)"

This reverts commit 0962a1429a.

* fix playback that only uses fps filter

* nvidia needs privileged
This commit is contained in:
Jason Dove
2021-05-25 05:13:51 -05:00
committed by GitHub
parent 141a34933d
commit f9427cac99
11 changed files with 201 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErsatzTV.Core.Tests/FFmpeg/FFmpegPlaybackSettingsCalculatorTests.cs
+28 -29
View File
@@ -467,35 +467,34 @@ namespace ErsatzTV.Core.Tests.FFmpeg
actual.VideoCodec.Should().Be("copy");
}
// disabled while frame rate normalization is unused
// [Test]
// public void ShouldNot_SetCopyVideoCodec_When_ContentIsCorrectSize_And_CorrectCodec_And_Framerate_ForTransportStream()
// {
// var ffmpegProfile = new FFmpegProfile
// {
// NormalizeVideo = true,
// Resolution = new Resolution { Width = 1920, Height = 1080 },
// VideoCodec = "libx264",
// FrameRate = "24"
// };
//
// // not anamorphic
// var version = new MediaVersion
// { Width = 1920, Height = 1080, SampleAspectRatio = "1:1" };
//
// FFmpegPlaybackSettings actual = _calculator.CalculateSettings(
// StreamingMode.TransportStream,
// ffmpegProfile,
// version,
// new MediaStream { Codec = "libx264" },
// new MediaStream(),
// DateTimeOffset.Now,
// DateTimeOffset.Now);
//
// actual.ScaledSize.IsNone.Should().BeTrue();
// actual.PadToDesiredResolution.Should().BeFalse();
// actual.VideoCodec.Should().NotBe("copy");
// }
[Test]
public void Should_SetCorrectVideoCodec_When_ContentIsCorrectSize_And_CorrectCodec_And_Framerate_ForTransportStream()
{
var ffmpegProfile = new FFmpegProfile
{
NormalizeVideo = true,
Resolution = new Resolution { Width = 1920, Height = 1080 },
VideoCodec = "libx264",
FrameRate = "24"
};
// not anamorphic
var version = new MediaVersion
{ Width = 1920, Height = 1080, SampleAspectRatio = "1:1" };
FFmpegPlaybackSettings actual = _calculator.CalculateSettings(
StreamingMode.TransportStream,
ffmpegProfile,
version,
new MediaStream { Codec = "libx264" },
new MediaStream(),
DateTimeOffset.Now,
DateTimeOffset.Now);
actual.ScaledSize.IsNone.Should().BeTrue();
actual.PadToDesiredResolution.Should().BeFalse();
actual.VideoCodec.Should().Be("libx264");
}
[Test]
public void