|
|
@ -59,42 +59,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var encodingOptions = ApiEntryPoint.Instance.GetEncodingOptions();
|
|
|
|
var encodingOptions = ApiEntryPoint.Instance.GetEncodingOptions();
|
|
|
|
|
|
|
|
|
|
|
|
var audioTranscodeParams = new List<string>();
|
|
|
|
return EncodingHelper.GetProgressiveAudioFullCommandLine(state, encodingOptions, outputPath);
|
|
|
|
|
|
|
|
|
|
|
|
var bitrate = state.OutputAudioBitrate;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (bitrate.HasValue)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
audioTranscodeParams.Add("-ab " + bitrate.Value.ToString(UsCulture));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (state.OutputAudioChannels.HasValue)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
audioTranscodeParams.Add("-ac " + state.OutputAudioChannels.Value.ToString(UsCulture));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// opus will fail on 44100
|
|
|
|
|
|
|
|
if (!string.Equals(state.OutputAudioCodec, "opus", global::System.StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (state.OutputAudioSampleRate.HasValue)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
audioTranscodeParams.Add("-ar " + state.OutputAudioSampleRate.Value.ToString(UsCulture));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const string vn = " -vn";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var threads = EncodingHelper.GetNumberOfThreads(state, encodingOptions, false);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var inputModifier = EncodingHelper.GetInputModifier(state, encodingOptions);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return string.Format("{0} {1} -threads {2}{3} {4} -id3v2_version 3 -write_id3v1 1 -y \"{5}\"",
|
|
|
|
|
|
|
|
inputModifier,
|
|
|
|
|
|
|
|
EncodingHelper.GetInputArgument(state, encodingOptions),
|
|
|
|
|
|
|
|
threads,
|
|
|
|
|
|
|
|
vn,
|
|
|
|
|
|
|
|
string.Join(" ", audioTranscodeParams.ToArray()),
|
|
|
|
|
|
|
|
outputPath).Trim();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public AudioService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext, IImageProcessor imageProcessor) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, authorizationContext, imageProcessor)
|
|
|
|
public AudioService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext, IImageProcessor imageProcessor) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, authorizationContext, imageProcessor)
|
|
|
|