diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-03-25 10:03:37 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-03-25 10:03:37 -0400 |
| commit | c292fc56ea2f2dc3eeae74ff095ecbd996951d4f (patch) | |
| tree | a605c3c87af34fb6eb0bc7726cd2c9f919552f9a | |
| parent | e73d65f20d81c660d54537f20ec5920649ef2868 (diff) | |
updated hls keyframes
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/BaseHlsService.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs index b2ce1ab8a..015db04fb 100644 --- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs @@ -171,8 +171,10 @@ namespace MediaBrowser.Api.Playback.Hls segmentOutputPath = Path.Combine(segmentOutputPath, segmentOutputName + "%03d." + GetSegmentFileExtension(state).TrimStart('.')); var probeSize = Kernel.Instance.FFMpegManager.GetProbeSizeArgument(state.Item); - - return string.Format("{0} {1} -i {2}{3} -threads 0 {4} {5} {6} -force_key_frames expr:gte(t,n_forced*5) -f ssegment -segment_list_flags +live -segment_time 10 -segment_list \"{7}\" \"{8}\"", + + const string keyFrameArg = " -force_key_frames expr:if(isnan(prev_forced_t),gte(t,0),gte(t,prev_forced_t+5))"; + + return string.Format("{0} {1} -i {2}{3} -threads 0 {4} {5} {6}{7} -f ssegment -segment_list_flags +live -segment_time 10 -segment_list \"{8}\" \"{9}\"", probeSize, GetFastSeekCommandLineParameter(state.Request), GetInputArgument(state.Item, state.IsoMount), @@ -180,6 +182,7 @@ namespace MediaBrowser.Api.Playback.Hls GetMapArgs(state), GetVideoArguments(state), GetAudioArguments(state), + keyFrameArg, outputPath, segmentOutputPath ).Trim(); |
