diff options
| author | Cody Robibero <cody@robibe.ro> | 2024-09-11 12:10:17 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-11 12:10:17 -0600 |
| commit | e6ceab46a4acdd8ef455ad5d64494cd767dcdbf6 (patch) | |
| tree | 00fb32766575860ec8cb0103cac259c39970ec85 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 81aca67745d541e276cfa05efe57e52e9f5a5d0e (diff) | |
| parent | dd462f807268a6c3eb4b053605c11316b1795b98 (diff) | |
Merge pull request #12627 from oxixes/burn-subtitle-cache
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 778c32c4b..5cc604a02 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1652,13 +1652,15 @@ namespace MediaBrowser.Controller.MediaEncoding setPtsParam); } - var mediaPath = state.MediaPath ?? string.Empty; + var subtitlePath = _subtitleEncoder.GetSubtitleFilePath( + state.SubtitleStream, + state.MediaSource, + CancellationToken.None).GetAwaiter().GetResult(); return string.Format( CultureInfo.InvariantCulture, - "subtitles=f='{0}':si={1}{2}{3}{4}{5}", - _mediaEncoder.EscapeSubtitleFilterPath(mediaPath), - state.InternalSubtitleStreamOffset.ToString(CultureInfo.InvariantCulture), + "subtitles=f='{0}'{1}{2}{3}{4}", + _mediaEncoder.EscapeSubtitleFilterPath(subtitlePath), alphaParam, sub2videoParam, fontParam, |