lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2241 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-10-17 12:19:58 -04:00 committed by GitHub
commit b0147c32f9
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View File

@ -885,8 +885,13 @@ namespace MediaBrowser.Api.Playback.Hls
}
var mapArgs = state.IsOutputVideo ? GetMapArgs(state) : string.Empty;
var enableSplittingOnNonKeyFrames = state.VideoRequest.EnableSplittingOnNonKeyFrames && string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase);
enableSplittingOnNonKeyFrames = false;
if (state.VideoRequest.EnableSplittingOnNonKeyFrames)
// TODO: check libavformat version for 57 50.100 and use -hls_flags split_by_time
var hlsProtocolSupportsSplittingByTime = false;
if (enableSplittingOnNonKeyFrames && !hlsProtocolSupportsSplittingByTime)
{
var outputTsArg = Path.Combine(Path.GetDirectoryName(outputPath), Path.GetFileNameWithoutExtension(outputPath)) + "%d" + GetSegmentFileExtension(state);
@ -905,9 +910,7 @@ namespace MediaBrowser.Api.Playback.Hls
).Trim();
}
// TODO: check libavformat version for 57 50.100 and use -hls_flags split_by_time
var supportsSplitByTime = false;
var splitByTime = supportsSplitByTime && state.VideoRequest.EnableSplittingOnNonKeyFrames;
var splitByTime = hlsProtocolSupportsSplittingByTime && enableSplittingOnNonKeyFrames;
var splitByTimeArg = splitByTime ? " -hls_flags split_by_time" : "";
return string.Format("{0}{12} {1} -map_metadata -1 -threads {2} {3} {4}{5} {6} -max_delay 5000000 -avoid_negative_ts disabled -start_at_zero -hls_time {7}{8} -start_number {9} -hls_list_size {10} -y \"{11}\"",

22
MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
View File

@ -449,10 +449,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteElementString("plot", overview);
}
var hasShortOverview = item as IHasShortOverview;
if (hasShortOverview != null)
if (item is Video)
{
var outline = (hasShortOverview.ShortOverview ?? string.Empty)
var outline = (item.ShortOverview ?? string.Empty)
.StripHtml()
.Replace(""", "'");
@ -658,19 +657,14 @@ namespace MediaBrowser.XbmcMetadata.Savers
}
}
var hasCriticRating = item as IHasCriticRating;
if (hasCriticRating != null)
if (item.CriticRating.HasValue)
{
if (hasCriticRating.CriticRating.HasValue)
{
writer.WriteElementString("criticrating", hasCriticRating.CriticRating.Value.ToString(UsCulture));
}
writer.WriteElementString("criticrating", item.CriticRating.Value.ToString(UsCulture));
}
if (!string.IsNullOrEmpty(hasCriticRating.CriticRatingSummary))
{
writer.WriteElementString("criticratingsummary", hasCriticRating.CriticRatingSummary);
}
if (!string.IsNullOrEmpty(item.CriticRatingSummary))
{
writer.WriteElementString("criticratingsummary", item.CriticRatingSummary);
}
var hasDisplayOrder = item as IHasDisplayOrder;