aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Emby.Dlna/DlnaManager.cs2
-rw-r--r--Emby.Dlna/Main/DlnaEntryPoint.cs2
-rw-r--r--Emby.Server.Implementations/Localization/Core/cy.json8
-rw-r--r--Emby.Server.Implementations/Localization/Core/ja.json5
-rw-r--r--Emby.Server.Implementations/Localization/Core/ro.json4
-rw-r--r--Emby.Server.Implementations/Localization/Core/sk.json5
-rw-r--r--Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs12
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs6
8 files changed, 34 insertions, 10 deletions
diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index 192128c7e..fe78d74ee 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -456,7 +456,7 @@ namespace Emby.Dlna
/// <inheritdoc />
public string GetServerDescriptionXml(IHeaderDictionary headers, string serverUuId, string serverAddress)
{
- var profile = GetDefaultProfile();
+ var profile = GetProfile(headers) ?? GetDefaultProfile();
var serverId = _appHost.SystemId;
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index 08f639d93..2a535d556 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -362,7 +362,7 @@ namespace Emby.Dlna.Main
guid = text.GetMD5();
}
- return guid.ToString("N", CultureInfo.InvariantCulture);
+ return guid.ToString("D", CultureInfo.InvariantCulture);
}
private void SetProperies(SsdpDevice device, string fullDeviceType)
diff --git a/Emby.Server.Implementations/Localization/Core/cy.json b/Emby.Server.Implementations/Localization/Core/cy.json
index 981614005..e152ac643 100644
--- a/Emby.Server.Implementations/Localization/Core/cy.json
+++ b/Emby.Server.Implementations/Localization/Core/cy.json
@@ -15,7 +15,7 @@
"Folders": "Ffolderi",
"Favorites": "Ffefrynnau",
"LabelRunningTimeValue": "Amser rhedeg: {0}",
- "TaskOptimizeDatabase": "Cronfa ddata Optimeiddio",
+ "TaskOptimizeDatabase": "Optimeiddio cronfa ddata",
"TaskRefreshChannels": "Adnewyddu Sianeli",
"TaskRefreshPeople": "Adnewyddu Pobl",
"TasksChannelsCategory": "Sianeli Internet",
@@ -106,5 +106,9 @@
"HeaderRecordingGroups": "Grwpiau Recordio",
"HeaderFavoriteSongs": "Ffefryn Ganeuon",
"HeaderFavoriteShows": "Ffefryn Shoeau",
- "HeaderFavoriteEpisodes": "Ffefryn Rhaglenni"
+ "HeaderFavoriteEpisodes": "Ffefryn Rhaglenni",
+ "TaskDownloadMissingSubtitlesDescription": "Chwilio'r rhyngrwyd am is-deitlau coll yn seiliedig ar gosodiadau metaddata.",
+ "TaskDownloadMissingSubtitles": "Lawrlwytho isdeitlau coll",
+ "TaskCleanTranscodeDescription": "Dileu ffeiliau trawsgodio fwy nag un diwrnod oed.",
+ "External": "Allanol"
}
diff --git a/Emby.Server.Implementations/Localization/Core/ja.json b/Emby.Server.Implementations/Localization/Core/ja.json
index 2588f1e8c..8cab706be 100644
--- a/Emby.Server.Implementations/Localization/Core/ja.json
+++ b/Emby.Server.Implementations/Localization/Core/ja.json
@@ -119,5 +119,8 @@
"Forced": "強制",
"Default": "デフォルト",
"TaskOptimizeDatabaseDescription": "データベースをコンパクトにして、空き領域を切り詰めます。メディアライブラリのスキャン後でこのタスクを実行するとパフォーマンスが向上する可能性があります。",
- "TaskOptimizeDatabase": "データベースの最適化"
+ "TaskOptimizeDatabase": "データベースの最適化",
+ "TaskKeyframeExtractorDescription": "より正確なHLSプレイリストを作成するため、動画ファイルからキーフレームを抽出する。この処理には時間がかかる場合があります。",
+ "TaskKeyframeExtractor": "キーフレーム抽出",
+ "External": "外部"
}
diff --git a/Emby.Server.Implementations/Localization/Core/ro.json b/Emby.Server.Implementations/Localization/Core/ro.json
index 8af5449a7..57bfd1792 100644
--- a/Emby.Server.Implementations/Localization/Core/ro.json
+++ b/Emby.Server.Implementations/Localization/Core/ro.json
@@ -119,5 +119,7 @@
"Forced": "Forțat",
"Default": "Implicit",
"TaskOptimizeDatabaseDescription": "Compactează baza de date și trunchiază spațiul liber. Rularea acestei sarcini după scanarea bibliotecii sau după efectuarea altor modificări care implică modificări ale bazei de date poate îmbunătăți performanța.",
- "TaskOptimizeDatabase": "Optimizează baza de date"
+ "TaskOptimizeDatabase": "Optimizează baza de date",
+ "TaskKeyframeExtractorDescription": "Extrage cadrele cheie din fișierele video pentru a crea liste de redare HLS mai precise. Această sarcină poate rula o perioadă lungă de timp.",
+ "External": "Extern"
}
diff --git a/Emby.Server.Implementations/Localization/Core/sk.json b/Emby.Server.Implementations/Localization/Core/sk.json
index 37da7d5ab..7502969a6 100644
--- a/Emby.Server.Implementations/Localization/Core/sk.json
+++ b/Emby.Server.Implementations/Localization/Core/sk.json
@@ -120,5 +120,8 @@
"Forced": "Vynútené",
"Default": "Predvolené",
"TaskOptimizeDatabaseDescription": "Zmenší databázu a odstráni prázdne miesto. Spustenie tejto úlohy po skenovaní knižnice alebo po iných zmenách zahŕňajúcich úpravy databáze môže zlepšiť výkon.",
- "TaskOptimizeDatabase": "Optimalizovať databázu"
+ "TaskOptimizeDatabase": "Optimalizovať databázu",
+ "TaskKeyframeExtractorDescription": "Extrahuje kľúčové snímky z video súborov na vytvorenie presnejších HLS playlistov. Táto úloha môže trvať dlhšiu dobu.",
+ "TaskKeyframeExtractor": "Extraktor kľúčových snímkov",
+ "External": "Externé"
}
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index fa98fda69..3df8481fd 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -29,6 +29,7 @@ using Jellyfin.Server.Filters;
using Jellyfin.Server.Formatters;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Session;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
@@ -428,6 +429,17 @@ namespace Jellyfin.Server.Extensions
Nullable = true
}
});
+
+ // Manually describe Flags enum.
+ options.MapType<TranscodeReason>(() =>
+ new OpenApiSchema
+ {
+ Type = "string",
+ Enum = Enum.GetNames<TranscodeReason>()
+ .Select(e => new OpenApiString(e))
+ .Cast<IOpenApiAny>()
+ .ToArray()
+ });
}
}
}
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 261ce915f..c09f00d7d 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2893,8 +2893,8 @@ namespace MediaBrowser.Controller.MediaEncoding
}
var memoryOutput = false;
- var isUploadForOclTonemap = isSwDecoder && doCuTonemap;
- if ((isNvDecoder && isSwEncoder) || isUploadForOclTonemap)
+ var isUploadForCuTonemap = isSwDecoder && doCuTonemap;
+ if ((isNvDecoder && isSwEncoder) || (isUploadForCuTonemap && hasSubs))
{
memoryOutput = true;
@@ -2904,7 +2904,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
// OUTPUT yuv420p surface(memory)
- if (isSwDecoder && isNvencEncoder)
+ if (isSwDecoder && isNvencEncoder && !isUploadForCuTonemap)
{
memoryOutput = true;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-11 08:14:22 +0000