Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 20:24:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
nicknsy 2023-02-23 18:03:22 -08:00 committed by Nick
parent 6c649a7e72
commit d448cc18ea
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jellyfin.Api/Controllers/TrickplayController.cs
View File

@ -128,6 +128,7 @@ public class TrickplayController : BaseJellyfinApiController
var layout = tilesInfo.TileWidth.ToString(CultureInfo.InvariantCulture) + "x" + tilesInfo.TileHeight.ToString(CultureInfo.InvariantCulture); var layout = tilesInfo.TileWidth.ToString(CultureInfo.InvariantCulture) + "x" + tilesInfo.TileHeight.ToString(CultureInfo.InvariantCulture);
var tilesPerGrid = tilesInfo.TileWidth * tilesInfo.TileHeight; var tilesPerGrid = tilesInfo.TileWidth * tilesInfo.TileHeight;
var tileDuration = (decimal)tilesInfo.Interval / 1000; var tileDuration = (decimal)tilesInfo.Interval / 1000;
var infDuration = tileDuration * tilesPerGrid;
var tileGridCount = (int)Math.Ceiling((decimal)tilesInfo.TileCount / tilesPerGrid); var tileGridCount = (int)Math.Ceiling((decimal)tilesInfo.TileCount / tilesPerGrid);
builder.AppendLine("#EXTM3U"); builder.AppendLine("#EXTM3U");
@ -144,9 +145,9 @@ public class TrickplayController : BaseJellyfinApiController
if (i == tileGridCount - 1) if (i == tileGridCount - 1)
{ {
tilesPerGrid = tilesInfo.TileCount - (i * tilesPerGrid); tilesPerGrid = tilesInfo.TileCount - (i * tilesPerGrid);
infDuration = tileDuration * tilesPerGrid;
} }
var infDuration = tileDuration * tilesPerGrid;
var url = string.Format( var url = string.Format(
CultureInfo.InvariantCulture, CultureInfo.InvariantCulture,
urlFormat, urlFormat,

6
MediaBrowser.Providers/Trickplay/TrickplayManager.cs
View File

@ -127,7 +127,7 @@ namespace MediaBrowser.Providers.Trickplay
// Create tiles // Create tiles
var tilesTempDir = Path.Combine(imgTempDir, Guid.NewGuid().ToString("N")); var tilesTempDir = Path.Combine(imgTempDir, Guid.NewGuid().ToString("N"));
var tilesInfo = CreateTiles(images, width, interval, tileWidth, tileHeight, tilesTempDir, outputDir); var tilesInfo = CreateTiles(images, width, interval, tileWidth, tileHeight, 100/* todo _config.JpegQuality*/, tilesTempDir, outputDir);
// Save tiles info // Save tiles info
try try
@ -166,7 +166,7 @@ namespace MediaBrowser.Providers.Trickplay
} }
} }
private TrickplayTilesInfo CreateTiles(List<FileSystemMetadata> images, int width, int interval, int tileWidth, int tileHeight, string workDir, string outputDir) private TrickplayTilesInfo CreateTiles(List<FileSystemMetadata> images, int width, int interval, int tileWidth, int tileHeight, int quality, string workDir, string outputDir)
{ {
if (images.Count == 0) if (images.Count == 0)
{ {
@ -244,7 +244,7 @@ namespace MediaBrowser.Providers.Trickplay
var tileGridPath = Path.Combine(workDir, $"{imgNo}.jpg"); var tileGridPath = Path.Combine(workDir, $"{imgNo}.jpg");
using (var stream = File.OpenWrite(tileGridPath)) using (var stream = File.OpenWrite(tileGridPath))
{ {
tileGrid.Encode(stream, SKEncodedImageFormat.Jpeg, 100/* todo _config.JpegQuality*/); tileGrid.Encode(stream, SKEncodedImageFormat.Jpeg, quality);
} }
var bitrate = (int)Math.Ceiling((decimal)new FileInfo(tileGridPath).Length * 8 / tilesInfo.TileWidth / tilesInfo.TileHeight / (tilesInfo.Interval / 1000)); var bitrate = (int)Math.Ceiling((decimal)new FileInfo(tileGridPath).Length * 8 / tilesInfo.TileWidth / tilesInfo.TileHeight / (tilesInfo.Interval / 1000));

2
MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
View File

@ -107,14 +107,12 @@ namespace MediaBrowser.Providers.Trickplay
if (options.IsAutomated && !enableDuringScan.GetValueOrDefault(false)) if (options.IsAutomated && !enableDuringScan.GetValueOrDefault(false))
{ {
_logger.LogDebug("exit refresh: automated - {0} enable scan - {1}", options.IsAutomated, enableDuringScan.GetValueOrDefault(false));
return ItemUpdateType.None; return ItemUpdateType.None;
} }
// TODO: this is always blocking for metadata collection, make non-blocking option // TODO: this is always blocking for metadata collection, make non-blocking option
if (true) if (true)
{ {
_logger.LogDebug("called refresh");
await _trickplayManager.RefreshTrickplayData(video, replace, cancellationToken).ConfigureAwait(false); await _trickplayManager.RefreshTrickplayData(video, replace, cancellationToken).ConfigureAwait(false);
} }