mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 06:17:14 -04:00
revised windows phone fix
This commit is contained in:
parent
893093a64a
commit
211d24e66e
@ -518,7 +518,7 @@ namespace MediaBrowser.Api.Playback
|
||||
|
||||
ServerEntryPoint.Instance.OnTranscodeBeginning(outputPath, TranscodingJobType, process);
|
||||
|
||||
//Logger.Info(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
|
||||
Logger.Info(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
|
||||
|
||||
var logFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "ffmpeg-" + Guid.NewGuid() + ".txt");
|
||||
|
||||
|
@ -25,13 +25,13 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Class VideoService
|
||||
/// </summary>
|
||||
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)
|
||||
{
|
||||
}
|
||||
@ -45,7 +45,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||
{
|
||||
return ProcessRequest(request);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Gets the command line arguments.
|
||||
/// </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,
|
||||
GetFastSeekCommandLineParameter(state.Request),
|
||||
GetInputArgument(video, state.IsoMount),
|
||||
@ -81,6 +88,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||
GetVideoArguments(state, videoCodec),
|
||||
graphicalSubtitleParam,
|
||||
GetAudioArguments(state),
|
||||
format,
|
||||
outputPath
|
||||
).Trim();
|
||||
}
|
||||
@ -124,11 +132,6 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||
args += " -bsf h264_mp4toannexb";
|
||||
}
|
||||
|
||||
if (string.Equals("wmv2", videoCodec))
|
||||
{
|
||||
args += " -f asf";
|
||||
}
|
||||
|
||||
return args;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user