Skip to content

Commit 5c4d0ab

Browse files
author
JPVenson
committed
#12 Fixed
#9 Fixed
1 parent 895b84d commit 5c4d0ab

22 files changed

+1419
-11378
lines changed

Jellyfin.HardwareVisualizer/Server/Database/Configuration/MediaTestFileConfig.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ public class MediaTestFileConfig : IEntityTypeConfiguration<MediaTestFile>
77
{
88
public void Configure(EntityTypeBuilder<MediaTestFile> modelBuilder)
99
{
10-
var sourceUrl = "";
11-
1210
modelBuilder.HasData(new MediaTestFile[]
1311
{
1412
new MediaTestFile()
@@ -18,7 +16,7 @@ public void Configure(EntityTypeBuilder<MediaTestFile> modelBuilder)
1816
SourceUrl = "https://repo.jellyfin.org/test-videos/SDR/HEVC%2010bit/Test%20Jellyfin%204K%20HEVC%2010bit%20150M.mp4",
1917
Bitrate = 150,
2018
Size = 528,
21-
VideoCodec = "HEVC",
19+
VideoCodecId = HardwareCodecConfig.hvecCodecId,
2220
AudioCodec = "",
2321
HashSha256 = "08bec94467502aec0123f7a1a7f7ba11240de7ff784c1b2b3b66f2936a3e56a1",
2422
HashMd5 = "caf635e717ce87c40f751da542e18f16",
@@ -30,7 +28,7 @@ public void Configure(EntityTypeBuilder<MediaTestFile> modelBuilder)
3028
SourceUrl = "https://repo.jellyfin.org/test-videos/SDR/AVC/Test%20Jellyfin%204K%20AVC%20150M.mp4",
3129
Bitrate = 150,
3230
Size = 528,
33-
VideoCodec = "h264",
31+
VideoCodecId = HardwareCodecConfig.h264CodecId,
3432
AudioCodec = "",
3533
HashSha256 = "71b6633c593a8aab36a050db0369901640ec102caf00735a1fa7b16cbbb2aa42",
3634
HashMd5 = "75330504461b4920b51bd7e7f67096d2",
@@ -42,7 +40,7 @@ public void Configure(EntityTypeBuilder<MediaTestFile> modelBuilder)
4240
SourceUrl = "https://repo.jellyfin.org/test-videos/SDR/HEVC%2010bit/Test%20Jellyfin%204K%20HEVC%2010bit%2040M.mp4",
4341
Bitrate = 40,
4442
Size = 141,
45-
VideoCodec = "HEVC",
43+
VideoCodecId = HardwareCodecConfig.hvecCodecId,
4644
AudioCodec = "",
4745
HashSha256 = "738a7fb8fd951421791286a9609f03b963acd3d424420b3e58edac50ec8cf31c",
4846
HashMd5 = "8530221143ce1fc59c1be6947b82c4bd",
@@ -54,7 +52,7 @@ public void Configure(EntityTypeBuilder<MediaTestFile> modelBuilder)
5452
SourceUrl = "https://repo.jellyfin.org/test-videos/SDR/AVC/Test%20Jellyfin%201080p%20AVC%2030M.mp4",
5553
Bitrate = 30,
5654
Size = 106,
57-
VideoCodec = "h264",
55+
VideoCodecId = HardwareCodecConfig.h264CodecId,
5856
AudioCodec = "",
5957
HashSha256 = "9851037c599bb02bebfb2e77a6d88ab4d3e295542e3ad6b8f062711dae5112ec",
6058
HashMd5 = "7b0f05d66d0897bf9d5e3746a973acce",

Jellyfin.HardwareVisualizer/Server/Database/Configuration/TestCaseArgumentConfig.cs

Lines changed: 102 additions & 132 deletions
Large diffs are not rendered by default.

Jellyfin.HardwareVisualizer/Server/Database/Configuration/TestCaseConfig.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public void Configure(EntityTypeBuilder<TestCase> modelBuilder)
1313
#region File E8A75E65-A3F3-4D92-A45B-84E71A13EFAB
1414
new TestCase()
1515
{
16-
1716
MediaTestFileId = new Guid("E8A75E65-A3F3-4D92-A45B-84E71A13EFAB"),
1817
TestCaseType = TestCaseType.Transcode,
1918
FromResolution = "2160p",
@@ -23,7 +22,6 @@ public void Configure(EntityTypeBuilder<TestCase> modelBuilder)
2322
},
2423
new TestCase()
2524
{
26-
2725
MediaTestFileId = new Guid("E8A75E65-A3F3-4D92-A45B-84E71A13EFAB"),
2826
TestCaseType = TestCaseType.Transcode,
2927
FromResolution = "2160p",
@@ -33,7 +31,6 @@ public void Configure(EntityTypeBuilder<TestCase> modelBuilder)
3331
},
3432
new TestCase()
3533
{
36-
3734
MediaTestFileId = new Guid("E8A75E65-A3F3-4D92-A45B-84E71A13EFAB"),
3835
TestCaseType = TestCaseType.Transcode,
3936
FromResolution = "2160p",
@@ -43,7 +40,6 @@ public void Configure(EntityTypeBuilder<TestCase> modelBuilder)
4340
},
4441
new TestCase()
4542
{
46-
4743
MediaTestFileId = new Guid("E8A75E65-A3F3-4D92-A45B-84E71A13EFAB"),
4844
TestCaseType = TestCaseType.Transcode,
4945
FromResolution = "1080p",

Jellyfin.HardwareVisualizer/Server/Database/MediaTestFile.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ public class MediaTestFile : HashedExternalEntity
1111

1212
public long Bitrate { get; set; }
1313
public long Size { get; set; }
14-
public string VideoCodec { get; set; }
14+
public Guid VideoCodecId { get; set; }
1515
public string AudioCodec { get; set; }
1616

1717
public ICollection<TestCase> TestCases { get; set; }
18+
19+
public HardwareCodec VideoCodec { get; set; }
1820
}

Jellyfin.HardwareVisualizer/Server/Database/TestCaseArgument.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ public record TestCaseArgument
1010

1111
public Guid FfmpegVersionGroupId { get; set; }
1212

13-
public Guid HardwareCodecId { get; set; }
14-
public HardwareCodec HardwareCodec { get; set; }
13+
public Guid FromHardwareCodecId { get; set; }
14+
public HardwareCodec FromHardwareCodec { get; set; }
15+
16+
public Guid ToHardwareCodecId { get; set; }
17+
public HardwareCodec ToHardwareCodec { get; set; }
1518
}

0 commit comments

Comments
 (0)