|
|
@ -25,13 +25,13 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// Class VideoService
|
|
|
|
/// Class VideoService
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public class VideoService : BaseProgressiveStreamingService
|
|
|
|
public class VideoService : BaseProgressiveStreamingService
|
|
|
|
{
|
|
|
|
{
|
|
|
|
public VideoService(IServerApplicationPaths appPaths, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager)
|
|
|
|
public VideoService(IServerApplicationPaths appPaths, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager)
|
|
|
|
: base(appPaths, userManager, libraryManager, isoManager)
|
|
|
|
: base(appPaths, userManager, libraryManager, isoManager)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -45,7 +45,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return ProcessRequest(request);
|
|
|
|
return ProcessRequest(request);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// Gets the command line arguments.
|
|
|
|
/// Gets the command line arguments.
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
@ -72,7 +72,14 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return string.Format("{0} {1} -i {2}{3} -threads 0 {4} {5}{6} {7} \"{8}\"",
|
|
|
|
var format = string.Empty;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (string.Equals("wmv2", videoCodec, StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
format = " -f asf ";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return string.Format("{0} {1} -i {2}{3} -threads 0 {4} {5}{6} {7}{8} \"{9}\"",
|
|
|
|
probeSize,
|
|
|
|
probeSize,
|
|
|
|
GetFastSeekCommandLineParameter(state.Request),
|
|
|
|
GetFastSeekCommandLineParameter(state.Request),
|
|
|
|
GetInputArgument(video, state.IsoMount),
|
|
|
|
GetInputArgument(video, state.IsoMount),
|
|
|
@ -81,6 +88,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|
|
|
GetVideoArguments(state, videoCodec),
|
|
|
|
GetVideoArguments(state, videoCodec),
|
|
|
|
graphicalSubtitleParam,
|
|
|
|
graphicalSubtitleParam,
|
|
|
|
GetAudioArguments(state),
|
|
|
|
GetAudioArguments(state),
|
|
|
|
|
|
|
|
format,
|
|
|
|
outputPath
|
|
|
|
outputPath
|
|
|
|
).Trim();
|
|
|
|
).Trim();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -124,11 +132,6 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|
|
|
args += " -bsf h264_mp4toannexb";
|
|
|
|
args += " -bsf h264_mp4toannexb";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (string.Equals("wmv2", videoCodec))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
args += " -f asf";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return args;
|
|
|
|
return args;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|