@ -6,6 +6,7 @@ using System.Linq;
using System.Text ; using System.Text ;
using System.Threading ; using System.Threading ;
using System.Threading.Tasks ; using System.Threading.Tasks ;
using AsyncKeyedLock ;
using Jellyfin.Data.Entities ; using Jellyfin.Data.Entities ;
using MediaBrowser.Common.Configuration ; using MediaBrowser.Common.Configuration ;
using MediaBrowser.Controller.Configuration ; using MediaBrowser.Controller.Configuration ;
@ -37,7 +38,7 @@ public class TrickplayManager : ITrickplayManager
private readonly IDbContextFactory < JellyfinDbContext > _dbProvider ;
private readonly IDbContextFactory < JellyfinDbContext > _dbProvider ;
private readonly IApplicationPaths _appPaths ;
private readonly IApplicationPaths _appPaths ;
private static readonly SemaphoreSlim _resourcePool = new ( 1 , 1 ) ;
private static readonly AsyncNonKeyedLocker _resourcePool = new ( 1 ) ;
private static readonly string [ ] _trickplayImgExtensions = { ".jpg" } ;
private static readonly string [ ] _trickplayImgExtensions = { ".jpg" } ;
/// <summary>
/// <summary>
@ -107,93 +108,92 @@ public class TrickplayManager : ITrickplayManager
var imgTempDir = string . Empty ;
var imgTempDir = string . Empty ;
var outputDir = GetTrickplayDirectory ( video , width ) ;
var outputDir = GetTrickplayDirectory ( video , width ) ;
await _resourcePool . WaitAsync ( cancellationToken ) . ConfigureAwait ( false ) ;
using ( await _resourcePool . LockAsync ( cancellationToken ) . ConfigureAwait ( false ) )
try
{
{
if ( ! replace & & Directory . Exists ( outputDir ) & & ( await GetTrickplayResolutions ( video . Id ) . ConfigureAwait ( false ) ) . ContainsKey ( width ) )
try
{
_logger . LogDebug ( "Found existing trickplay files for {ItemId}. Exiting." , video . Id ) ;
return ;
}
// Extract images
// Note: Media sources under parent items exist as their own video/item as well. Only use this video stream for trickplay.
var mediaSource = video . GetMediaSources ( false ) . Find ( source = > Guid . Parse ( source . Id ) . Equals ( video . Id ) ) ;
if ( mediaSource is null )
{
{
_logger . LogDebug ( "Found no matching media source for item {ItemId}" , video . Id ) ;
if ( ! replace & & Directory . Exists ( outputDir ) & & ( await GetTrickplayResolutions ( video . Id ) . ConfigureAwait ( false ) ) . ContainsKey ( width ) )
return ;
{
}
_logger . LogDebug ( "Found existing trickplay files for {ItemId}. Exiting." , video . Id ) ;
return ;
}
var mediaPath = mediaSource . Path ;
// Extract images
var mediaStream = mediaSource . VideoStream ;
// Note: Media sources under parent items exist as their own video/item as well. Only use this video stream for trickplay.
var container = mediaSource . Container ;
var mediaSource = video . GetMediaSources ( false ) . Find ( source = > Guid . Parse ( source . Id ) . Equals ( video . Id ) ) ;
_logger . LogInformation ( "Creating trickplay files at {Width} width, for {Path} [ID: {ItemId}]" , width , mediaPath , video . Id ) ;
if ( mediaSource is null )
imgTempDir = await _mediaEncoder . ExtractVideoImagesOnIntervalAccelerated (
{
mediaPath ,
_logger . LogDebug ( "Found no matching media source for item {ItemId}" , video . Id ) ;
container ,
return ;
mediaSource ,
}
mediaStream ,
width ,
TimeSpan . FromMilliseconds ( options . Interval ) ,
options . EnableHwAcceleration ,
options . ProcessThreads ,
options . Qscale ,
options . ProcessPriority ,
_encodingHelper ,
cancellationToken ) . ConfigureAwait ( false ) ;
if ( string . IsNullOrEmpty ( imgTempDir ) | | ! Directory . Exists ( imgTempDir ) )
var mediaPath = mediaSource . Path ;
{
var mediaStream = mediaSource . VideoStream ;
throw new InvalidOperationException ( "Null or invalid directory from media encoder." ) ;
var container = mediaSource . Container ;
}
_logger . LogInformation ( "Creating trickplay files at {Width} width, for {Path} [ID: {ItemId}]" , width , mediaPath , video . Id ) ;
imgTempDir = await _mediaEncoder . ExtractVideoImagesOnIntervalAccelerated (
mediaPath ,
container ,
mediaSource ,
mediaStream ,
width ,
TimeSpan . FromMilliseconds ( options . Interval ) ,
options . EnableHwAcceleration ,
options . ProcessThreads ,
options . Qscale ,
options . ProcessPriority ,
_encodingHelper ,
cancellationToken ) . ConfigureAwait ( false ) ;
if ( string . IsNullOrEmpty ( imgTempDir ) | | ! Directory . Exists ( imgTempDir ) )
{
throw new InvalidOperationException ( "Null or invalid directory from media encoder." ) ;
}
var images = _fileSystem . GetFiles ( imgTempDir , _trickplayImgExtensions , false , false )
var images = _fileSystem . GetFiles ( imgTempDir , _trickplayImgExtensions , false , false )
. Select ( i = > i . FullName )
. Select ( i = > i . FullName )
. OrderBy ( i = > i )
. OrderBy ( i = > i )
. ToList ( ) ;
. ToList ( ) ;
// Create tiles
// Create tiles
var trickplayInfo = CreateTiles ( images , width , options , outputDir ) ;
var trickplayInfo = CreateTiles ( images , width , options , outputDir ) ;
// Save tiles info
// Save tiles info
try
try
{
if ( trickplayInfo is not null )
{
{
trickplayInfo . ItemId = video . Id ;
if ( trickplayInfo is not null )
await SaveTrickplayInfo ( trickplayInfo ) . ConfigureAwait ( false ) ;
{
trickplayInfo . ItemId = video . Id ;
await SaveTrickplayInfo ( trickplayInfo ) . ConfigureAwait ( false ) ;
_logger . LogInformation ( "Finished creation of trickplay files for {0}" , mediaPath ) ;
_logger . LogInformation ( "Finished creation of trickplay files for {0}" , mediaPath ) ;
}
else
{
throw new InvalidOperationException ( "Null trickplay tiles info from CreateTiles." ) ;
}
}
}
else
catch ( Exception ex )
{
{
throw new InvalidOperationException ( "Null trickplay tiles info from CreateTiles." ) ;
_logger . LogError ( ex , "Error while saving trickplay tiles info." ) ;
// Make sure no files stay in metadata folders on failure
// if tiles info wasn't saved.
Directory . Delete ( outputDir , true ) ;
}
}
}
}
catch ( Exception ex )
catch ( Exception ex )
{
{
_logger . LogError ( ex , "Error while saving trickplay tiles info." ) ;
_logger . LogError ( ex , "Error creating trickplay images." ) ;
// Make sure no files stay in metadata folders on failure
// if tiles info wasn't saved.
Directory . Delete ( outputDir , true ) ;
}
}
}
finally
catch ( Exception ex )
{
_logger . LogError ( ex , "Error creating trickplay images." ) ;
}
finally
{
_resourcePool . Release ( ) ;
if ( ! string . IsNullOrEmpty ( imgTempDir ) )
{
{
Directory . Delete ( imgTempDir , true ) ;
if ( ! string . IsNullOrEmpty ( imgTempDir ) )
{
Directory . Delete ( imgTempDir , true ) ;
}
}
}
}
}
}
}
Mark Cilia Vincenti
4 months ago