Skip to content

Commit

Permalink
Merge pull request #10158 from Bond-009/transcodepath
Browse files Browse the repository at this point in the history
Use the correct trancode path
  • Loading branch information
cvium committed Aug 27, 2023
2 parents 3b07d73 + 97d92e7 commit 42a0726
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public partial class EncodingHelper
private readonly IMediaEncoder _mediaEncoder;
private readonly ISubtitleEncoder _subtitleEncoder;
private readonly IConfiguration _config;
private readonly IConfigurationManager _configurationManager;

// i915 hang was fixed by linux 6.2 (3f882f2)
private readonly Version _minKerneli915Hang = new Version(5, 18);
Expand Down Expand Up @@ -112,12 +113,14 @@ public partial class EncodingHelper
IApplicationPaths appPaths,
IMediaEncoder mediaEncoder,
ISubtitleEncoder subtitleEncoder,
IConfiguration config)
IConfiguration config,
IConfigurationManager configurationManager)
{
_appPaths = appPaths;
_mediaEncoder = mediaEncoder;
_subtitleEncoder = subtitleEncoder;
_config = config;
_configurationManager = configurationManager;
}

[GeneratedRegex(@"\s+")]
Expand Down Expand Up @@ -1058,7 +1061,7 @@ public string GetInputArgument(EncodingJobInfo state, EncodingOptions options, s

if (state.MediaSource.VideoType == VideoType.Dvd || state.MediaSource.VideoType == VideoType.BluRay)
{
var tmpConcatPath = Path.Join(options.TranscodingTempPath, state.MediaSource.Id + ".concat");
var tmpConcatPath = Path.Join(_configurationManager.GetTranscodePath(), state.MediaSource.Id + ".concat");
_mediaEncoder.GenerateConcatConfig(state.MediaSource, tmpConcatPath);
arg.Append(" -f concat -safe 0 -i ")
.Append(tmpConcatPath);
Expand Down

0 comments on commit 42a0726

Please sign in to comment.