diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs index 3d4da1e15..d02031fe6 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs @@ -310,6 +310,9 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder case InputType.Bluray: inputPath = GetBlurayInputArgument(inputFiles[0]); break; + case InputType.Url: + inputPath = GetHttpInputArgument(inputFiles); + break; default: throw new ArgumentException("Unrecognized InputType"); } @@ -318,6 +321,18 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder } /// <summary> + /// Gets the HTTP input argument. + /// </summary> + /// <param name="inputFiles">The input files.</param> + /// <returns>System.String.</returns> + private string GetHttpInputArgument(string[] inputFiles) + { + var url = inputFiles[0]; + + return string.Format("\"{0}\"", url); + } + + /// <summary> /// Gets the probe size argument. /// </summary> /// <param name="type">The type.</param> @@ -1005,7 +1020,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder /// </summary> /// <param name="path">The path.</param> /// <returns>System.String.</returns> - public string GetFileInputArgument(string path) + private string GetFileInputArgument(string path) { return string.Format("file:\"{0}\"", path); } @@ -1015,7 +1030,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder /// </summary> /// <param name="playableStreamFiles">The playable stream files.</param> /// <returns>System.String.</returns> - public string GetConcatInputArgument(string[] playableStreamFiles) + private string GetConcatInputArgument(string[] playableStreamFiles) { // Get all streams // If there's more than one we'll need to use the concat command @@ -1027,7 +1042,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder } // Determine the input path for video files - return string.Format("file:\"{0}\"", playableStreamFiles[0]); + return GetFileInputArgument(playableStreamFiles[0]); } /// <summary> @@ -1035,7 +1050,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder /// </summary> /// <param name="blurayRoot">The bluray root.</param> /// <returns>System.String.</returns> - public string GetBlurayInputArgument(string blurayRoot) + private string GetBlurayInputArgument(string blurayRoot) { return string.Format("bluray:\"{0}\"", blurayRoot); } |