Browse Source

Merge pull request #10158 from Bond-009/transcodepath

Use the correct trancode path
Claus Vium 1 năm trước cách đây
mục cha
commit
42a07260fe

+ 5 - 2
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -37,6 +37,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IMediaEncoder _mediaEncoder;
         private readonly ISubtitleEncoder _subtitleEncoder;
         private readonly ISubtitleEncoder _subtitleEncoder;
         private readonly IConfiguration _config;
         private readonly IConfiguration _config;
+        private readonly IConfigurationManager _configurationManager;
 
 
         // i915 hang was fixed by linux 6.2 (3f882f2)
         // i915 hang was fixed by linux 6.2 (3f882f2)
         private readonly Version _minKerneli915Hang = new Version(5, 18);
         private readonly Version _minKerneli915Hang = new Version(5, 18);
@@ -112,12 +113,14 @@ namespace MediaBrowser.Controller.MediaEncoding
             IApplicationPaths appPaths,
             IApplicationPaths appPaths,
             IMediaEncoder mediaEncoder,
             IMediaEncoder mediaEncoder,
             ISubtitleEncoder subtitleEncoder,
             ISubtitleEncoder subtitleEncoder,
-            IConfiguration config)
+            IConfiguration config,
+            IConfigurationManager configurationManager)
         {
         {
             _appPaths = appPaths;
             _appPaths = appPaths;
             _mediaEncoder = mediaEncoder;
             _mediaEncoder = mediaEncoder;
             _subtitleEncoder = subtitleEncoder;
             _subtitleEncoder = subtitleEncoder;
             _config = config;
             _config = config;
+            _configurationManager = configurationManager;
         }
         }
 
 
         [GeneratedRegex(@"\s+")]
         [GeneratedRegex(@"\s+")]
@@ -1058,7 +1061,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
 
             if (state.MediaSource.VideoType == VideoType.Dvd || state.MediaSource.VideoType == VideoType.BluRay)
             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);
                 _mediaEncoder.GenerateConcatConfig(state.MediaSource, tmpConcatPath);
                 arg.Append(" -f concat -safe 0 -i ")
                 arg.Append(" -f concat -safe 0 -i ")
                     .Append(tmpConcatPath);
                     .Append(tmpConcatPath);