starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 06:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove PlayableStreamFileNames as unused

Browse Source 
Since ffmpeg can play and transcode ISO files and BDMV folders directly,
there's no use of that property.
This commit is contained in:
Stanislav Ionascu
2020-10-01 22:20:28 +02:00
parent 3ad6232973
commit cd4641dca0
14 changed files with 44 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
View File

@@ -1,46 +1,35 @@
#pragma warning disable CS1591
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using MediaBrowser.Model.MediaInfo;
namespace MediaBrowser.MediaEncoding.Encoder
{
public static class EncodingUtils
{
public static string GetInputArgument(string inputPrefix, IReadOnlyList<string> inputFiles, MediaProtocol protocol)
public static string GetInputArgument(string inputPrefix, string inputFile, MediaProtocol protocol)
{
if (protocol != MediaProtocol.File)
{
var url = inputFiles[0];
return string.Format(CultureInfo.InvariantCulture, "\"{0}\"", url);
return string.Format(CultureInfo.InvariantCulture, "\"{0}\"", inputFile);
}
return GetConcatInputArgument(inputFiles, inputPrefix);
return GetConcatInputArgument(inputFile, inputPrefix);
}
/// <summary>
/// Gets the concat input argument.
/// </summary>
/// <param name="inputFiles">The input files.</param>
/// <param name="inputFile">The input file.</param>
/// <param name="inputPrefix">The input prefix.</param>
/// <returns>System.String.</returns>
private static string GetConcatInputArgument(IReadOnlyList<string> inputFiles, string inputPrefix)
private static string GetConcatInputArgument(string inputFile, string inputPrefix)
{
// Get all streams
// If there's more than one we'll need to use the concat command
if (inputFiles.Count > 1)
{
var files = string.Join("|", inputFiles.Select(NormalizePath));
return string.Format(CultureInfo.InvariantCulture, "concat:\"{0}\"", files);
}
// Determine the input path for video files
return GetFileInputArgument(inputFiles[0], inputPrefix);
return GetFileInputArgument(inputFile, inputPrefix);
}
/// <summary>