From b35051463b6241bae93e5d50c0a2a1fe06da5e2f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 6 Feb 2017 01:05:34 -0500 Subject: [PATCH 1/2] restore features --- .../LiveTv/EmbyTV/EncodedRecorder.cs | 2 - .../Encoder/EncodingHelper.cs | 50 +++++++++---------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs index 1f739b3c6c..68126f9263 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs @@ -155,8 +155,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks); var inputModifiers = "-fflags +genpts -async 1 -vsync -1"; var mapArgs = string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase) ? "-map 0" : "-sn"; - // temporary - mapArgs = "-sn"; var commandLineArgs = "-i \"{0}\"{4} " + mapArgs + " {2} -map_metadata -1 -threads 0 {3} -y \"{1}\""; long startTimeTicks = 0; diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs index 83057dba4e..ed95529641 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs @@ -1486,33 +1486,33 @@ namespace MediaBrowser.MediaEncoding.Encoder //inputModifier += " -noaccurate_seek"; } - //if (!string.IsNullOrWhiteSpace(state.InputContainer)) - //{ - // var inputFormat = GetInputFormat(state.InputContainer); - // if (!string.IsNullOrWhiteSpace(inputFormat)) - // { - // inputModifier += " -f " + inputFormat; - // } - //} + if (!string.IsNullOrWhiteSpace(state.InputContainer)) + { + var inputFormat = GetInputFormat(state.InputContainer); + if (!string.IsNullOrWhiteSpace(inputFormat)) + { + inputModifier += " -f " + inputFormat; + } + } - //if (state.RunTimeTicks.HasValue) - //{ - // foreach (var stream in state.MediaSource.MediaStreams) - // { - // if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle) - // { - // if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1) - // { - // var decoder = GetDecoderFromCodec(stream.Codec); + if (state.RunTimeTicks.HasValue) + { + foreach (var stream in state.MediaSource.MediaStreams) + { + if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle) + { + if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1) + { + var decoder = GetDecoderFromCodec(stream.Codec); - // if (!string.IsNullOrWhiteSpace(decoder)) - // { - // inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder; - // } - // } - // } - // } - //} + if (!string.IsNullOrWhiteSpace(decoder)) + { + inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder; + } + } + } + } + } } return inputModifier; From 4704d22944f24fd1ab5a312e3d7b1b02be838a10 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 6 Feb 2017 01:51:02 -0500 Subject: [PATCH 2/2] version bump --- SharedVersion.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 16c5979105..b63f7d15e9 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.1.*")] -//[assembly: AssemblyVersion("3.1.259")] +[assembly: AssemblyVersion("3.2.0.100")]