diff options
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs index 9bd2e9270..bf4daf786 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs @@ -1,22 +1,27 @@ using MediaBrowser.Controller.MediaEncoding; -using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.MediaInfo; using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; namespace MediaBrowser.MediaEncoding.Encoder { public static class EncodingUtils { - private static readonly CultureInfo UsCulture = new CultureInfo("en-US"); - - public static string GetInputArgument(List<string> inputFiles, bool isRemote) + public static string GetInputArgument(List<string> inputFiles, MediaProtocol protocol) { - if (isRemote) + if (protocol == MediaProtocol.Http) { - return GetHttpInputArgument(inputFiles); + var url = inputFiles.First(); + + return string.Format("\"{0}\"", url); + } + if (protocol == MediaProtocol.Rtmp) + { + var url = inputFiles.First(); + + return string.Format("\"{0}\"", url); } return GetConcatInputArgument(inputFiles); @@ -52,35 +57,6 @@ namespace MediaBrowser.MediaEncoding.Encoder return string.Format("file:\"{0}\"", path); } - /// <summary> - /// Gets the HTTP input argument. - /// </summary> - /// <param name="inputFiles">The input files.</param> - /// <returns>System.String.</returns> - private static string GetHttpInputArgument(IEnumerable<string> inputFiles) - { - var url = inputFiles.First(); - - return string.Format("\"{0}\"", url); - } - - private static string GetFastSeekValue(EncodingOptions options) - { - var time = options.StartTimeTicks; - - if (time.HasValue) - { - var seconds = TimeSpan.FromTicks(time.Value).TotalSeconds; - - if (seconds > 0) - { - return string.Format("-ss {0}", seconds.ToString(UsCulture)); - } - } - - return string.Empty; - } - public static string GetProbeSizeArgument(bool isDvd) { return isDvd ? "-probesize 1G -analyzeduration 200M" : string.Empty; |
