aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/Progressive/VideoService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api/Playback/Progressive/VideoService.cs')
-rw-r--r--MediaBrowser.Api/Playback/Progressive/VideoService.cs13
1 files changed, 6 insertions, 7 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index 0ce33fca8..4b9d0fbb5 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -1,4 +1,3 @@
-using System.Threading;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Channels;
@@ -14,6 +13,7 @@ using MediaBrowser.Model.IO;
using ServiceStack;
using System;
using System.IO;
+using System.Threading;
namespace MediaBrowser.Api.Playback.Progressive
{
@@ -90,9 +90,9 @@ namespace MediaBrowser.Api.Playback.Progressive
/// </summary>
/// <param name="outputPath">The output path.</param>
/// <param name="state">The state.</param>
- /// <param name="performSubtitleConversions">if set to <c>true</c> [perform subtitle conversions].</param>
+ /// <param name="isEncoding">if set to <c>true</c> [is encoding].</param>
/// <returns>System.String.</returns>
- protected override string GetCommandLineArguments(string outputPath, StreamState state, bool performSubtitleConversions)
+ protected override string GetCommandLineArguments(string outputPath, StreamState state, bool isEncoding)
{
// Get the output codec name
var videoCodec = state.OutputVideoCodec;
@@ -114,7 +114,7 @@ namespace MediaBrowser.Api.Playback.Progressive
GetInputArgument(state),
keyFrame,
GetMapArgs(state),
- GetVideoArguments(state, videoCodec, performSubtitleConversions),
+ GetVideoArguments(state, videoCodec),
threads,
GetAudioArguments(state),
format,
@@ -127,9 +127,8 @@ namespace MediaBrowser.Api.Playback.Progressive
/// </summary>
/// <param name="state">The state.</param>
/// <param name="codec">The video codec.</param>
- /// <param name="performSubtitleConversion">if set to <c>true</c> [perform subtitle conversion].</param>
/// <returns>System.String.</returns>
- private string GetVideoArguments(StreamState state, string codec, bool performSubtitleConversion)
+ private string GetVideoArguments(StreamState state, string codec)
{
var args = "-vcodec " + codec;
@@ -157,7 +156,7 @@ namespace MediaBrowser.Api.Playback.Progressive
{
if (request.Width.HasValue || request.Height.HasValue || request.MaxHeight.HasValue || request.MaxWidth.HasValue)
{
- args += GetOutputSizeParam(state, codec, performSubtitleConversion, CancellationToken.None);
+ args += GetOutputSizeParam(state, codec, CancellationToken.None);
}
}