Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-06 03:26:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix segment_time_delta value for ffmpeg 4.1

Browse source
This commit is contained in:
Claus Vium 2019-08-16 19:52:54 +02:00
parent 685e9e4f58
commit 617f7e8b5b
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
MediaBrowser.Api/Playback/BaseStreamingService.cs
View file

@ -137,10 +137,10 @@ namespace MediaBrowser.Api.Playback
/// </summary> /// </summary>
private string GetOutputFilePath(StreamState state, EncodingOptions encodingOptions, string outputFileExtension) private string GetOutputFilePath(StreamState state, EncodingOptions encodingOptions, string outputFileExtension)
{ {
var data = GetCommandLineArguments("dummy\\dummy", encodingOptions, state, false); var data = $"{state.MediaPath}-" +
$"{state.UserAgent}" +
data += "-" + (state.Request.DeviceId ?? string.Empty) $"{state.Request.DeviceId ?? string.Empty}-" +
+ "-" + (state.Request.PlaySessionId ?? string.Empty); $"{state.Request.PlaySessionId ?? string.Empty}";
var filename = data.GetMD5().ToString("N", CultureInfo.InvariantCulture); var filename = data.GetMD5().ToString("N", CultureInfo.InvariantCulture);
var ext = outputFileExtension.ToLowerInvariant(); var ext = outputFileExtension.ToLowerInvariant();

18
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View file

@ -904,7 +904,8 @@ namespace MediaBrowser.Api.Playback.Hls
} }
else else
{ {
var keyFrameArg = string.Format(" -force_key_frames \"expr:gte(t,n_forced*{0})\"", var keyFrameArg = string.Format(" -force_key_frames:0 \"expr:gte(t,{0}+n_forced*{1})\"",
GetStartNumber(state) * state.SegmentLength,
state.SegmentLength.ToString(CultureInfo.InvariantCulture)); state.SegmentLength.ToString(CultureInfo.InvariantCulture));
var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode; var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
@ -961,10 +962,10 @@ namespace MediaBrowser.Api.Playback.Hls
var timeDeltaParam = string.Empty; var timeDeltaParam = string.Empty;
if (isEncoding && startNumber > 0) if (isEncoding && state.TargetFramerate > 0)
{ {
var startTime = state.SegmentLength * startNumber; float startTime = 1 / (state.TargetFramerate.Value * 2);
timeDeltaParam = string.Format("-segment_time_delta -{0}", startTime); timeDeltaParam = string.Format("-segment_time_delta {0}", Math.Round(startTime, 3));
} }
var segmentFormat = GetSegmentFileExtension(state.Request).TrimStart('.'); var segmentFormat = GetSegmentFileExtension(state.Request).TrimStart('.');
@ -973,11 +974,7 @@ namespace MediaBrowser.Api.Playback.Hls
segmentFormat = "mpegts"; segmentFormat = "mpegts";
} }
var breakOnNonKeyFrames = state.EnableBreakOnNonKeyFrames(videoCodec); return string.Format("{0} {1} -map_metadata -1 -map_chapters -1 -threads {2} {3} {4} {5} -f segment -max_delay 5000000 -avoid_negative_ts disabled -start_at_zero -segment_time {6} {10} -individual_header_trailer 0 -segment_format {11} -segment_list_type m3u8 -segment_start_number {7} -segment_list \"{8}\" -y \"{9}\"",
var breakOnNonKeyFramesArg = breakOnNonKeyFrames ? " -break_non_keyframes 1" : "";
return string.Format("{0} {1} -map_metadata -1 -map_chapters -1 -threads {2} {3} {4} {5} -f segment -max_delay 5000000 -avoid_negative_ts disabled -start_at_zero -segment_time {6} {10} -individual_header_trailer 0{12} -segment_format {11} -segment_list_type m3u8 -segment_start_number {7} -segment_list \"{8}\" -y \"{9}\"",
inputModifier, inputModifier,
EncodingHelper.GetInputArgument(state, encodingOptions), EncodingHelper.GetInputArgument(state, encodingOptions),
threads, threads,
@ -989,8 +986,7 @@ namespace MediaBrowser.Api.Playback.Hls
outputPath, outputPath,
outputTsArg, outputTsArg,
timeDeltaParam, timeDeltaParam,
segmentFormat, segmentFormat
breakOnNonKeyFramesArg
).Trim(); ).Trim();
} }
} }