mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-23 14:10:40 +02:00
commit
f4bd53d4db
|
@ -228,7 +228,7 @@ namespace MediaBrowser.Api
|
||||||
{
|
{
|
||||||
lock (_activeTranscodingJobs)
|
lock (_activeTranscodingJobs)
|
||||||
{
|
{
|
||||||
var job = _activeTranscodingJobs.First(j => j.Type == type && j.Path.Equals(path, StringComparison.OrdinalIgnoreCase));
|
var job = _activeTranscodingJobs.First(j => j.Type == type && string.Equals(j.Path, path, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
_activeTranscodingJobs.Remove(job);
|
_activeTranscodingJobs.Remove(job);
|
||||||
}
|
}
|
||||||
|
@ -250,19 +250,11 @@ namespace MediaBrowser.Api
|
||||||
return GetTranscodingJob(path, type) != null;
|
return GetTranscodingJob(path, type) != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public TranscodingJob GetTranscodingJobByPlaySessionId(string playSessionId)
|
|
||||||
{
|
|
||||||
lock (_activeTranscodingJobs)
|
|
||||||
{
|
|
||||||
return _activeTranscodingJobs.FirstOrDefault(j => j.PlaySessionId.Equals(playSessionId, StringComparison.OrdinalIgnoreCase));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public TranscodingJob GetTranscodingJob(string path, TranscodingJobType type)
|
public TranscodingJob GetTranscodingJob(string path, TranscodingJobType type)
|
||||||
{
|
{
|
||||||
lock (_activeTranscodingJobs)
|
lock (_activeTranscodingJobs)
|
||||||
{
|
{
|
||||||
return _activeTranscodingJobs.FirstOrDefault(j => j.Type == type && j.Path.Equals(path, StringComparison.OrdinalIgnoreCase));
|
return _activeTranscodingJobs.FirstOrDefault(j => j.Type == type && string.Equals(j.Path, path, StringComparison.OrdinalIgnoreCase));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -275,7 +267,7 @@ namespace MediaBrowser.Api
|
||||||
{
|
{
|
||||||
lock (_activeTranscodingJobs)
|
lock (_activeTranscodingJobs)
|
||||||
{
|
{
|
||||||
var job = _activeTranscodingJobs.FirstOrDefault(j => j.Type == type && j.Path.Equals(path, StringComparison.OrdinalIgnoreCase));
|
var job = _activeTranscodingJobs.FirstOrDefault(j => j.Type == type && string.Equals(j.Path, path, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
if (job == null)
|
if (job == null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -185,7 +185,7 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
{
|
{
|
||||||
var startTranscoding = false;
|
var startTranscoding = false;
|
||||||
|
|
||||||
var currentTranscodingIndex = GetCurrentTranscodingIndex(playlistPath, request.PlaySessionId, segmentExtension);
|
var currentTranscodingIndex = GetCurrentTranscodingIndex(playlistPath, segmentExtension);
|
||||||
var segmentGapRequiringTranscodingChange = 24 / state.SegmentLength;
|
var segmentGapRequiringTranscodingChange = 24 / state.SegmentLength;
|
||||||
|
|
||||||
if (currentTranscodingIndex == null)
|
if (currentTranscodingIndex == null)
|
||||||
|
@ -325,11 +325,9 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
return position;
|
return position;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int? GetCurrentTranscodingIndex(string playlist, string playSessionId, string segmentExtension)
|
public int? GetCurrentTranscodingIndex(string playlist, string segmentExtension)
|
||||||
{
|
{
|
||||||
var job = string.IsNullOrWhiteSpace(playSessionId) ?
|
var job = ApiEntryPoint.Instance.GetTranscodingJob(playlist, TranscodingJobType);
|
||||||
ApiEntryPoint.Instance.GetTranscodingJob(playlist, TranscodingJobType) :
|
|
||||||
ApiEntryPoint.Instance.GetTranscodingJobByPlaySessionId(playSessionId);
|
|
||||||
|
|
||||||
if (job == null || job.HasExited)
|
if (job == null || job.HasExited)
|
||||||
{
|
{
|
||||||
|
@ -844,11 +842,14 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
}
|
}
|
||||||
|
|
||||||
// See if we can save come cpu cycles by avoiding encoding
|
// See if we can save come cpu cycles by avoiding encoding
|
||||||
if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
args += state.VideoStream != null && IsH264(state.VideoStream)
|
if (state.VideoStream != null && IsH264(state.VideoStream))
|
||||||
? args + " -bsf:v h264_mp4toannexb"
|
{
|
||||||
: args;
|
args += " -bsf:v h264_mp4toannexb";
|
||||||
|
}
|
||||||
|
|
||||||
|
args += " -flags -global_header -sc_threshold 0";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -872,9 +873,14 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
{
|
{
|
||||||
args += GetGraphicalSubtitleParam(state, codec);
|
args += GetGraphicalSubtitleParam(state, codec);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
args += " -flags +loop-global_header -sc_threshold 0";
|
args += " -flags +loop-global_header -sc_threshold 0";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!EnableSplitTranscoding(state))
|
||||||
|
{
|
||||||
|
args += " -copyts";
|
||||||
|
}
|
||||||
|
|
||||||
return args;
|
return args;
|
||||||
}
|
}
|
||||||
|
@ -889,6 +895,8 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
var startNumberParam = isEncoding ? GetStartNumber(state).ToString(UsCulture) : "0";
|
var startNumberParam = isEncoding ? GetStartNumber(state).ToString(UsCulture) : "0";
|
||||||
|
|
||||||
var toTimeParam = string.Empty;
|
var toTimeParam = string.Empty;
|
||||||
|
var timestampOffsetParam = string.Empty;
|
||||||
|
|
||||||
if (EnableSplitTranscoding(state))
|
if (EnableSplitTranscoding(state))
|
||||||
{
|
{
|
||||||
var startTime = state.Request.StartTimeTicks ?? 0;
|
var startTime = state.Request.StartTimeTicks ?? 0;
|
||||||
|
@ -902,13 +910,12 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
//toTimeParam = " -to " + MediaEncoder.GetTimeParameter(endTime);
|
//toTimeParam = " -to " + MediaEncoder.GetTimeParameter(endTime);
|
||||||
toTimeParam = " -t " + MediaEncoder.GetTimeParameter(TimeSpan.FromSeconds(durationSeconds).Ticks);
|
toTimeParam = " -t " + MediaEncoder.GetTimeParameter(TimeSpan.FromSeconds(durationSeconds).Ticks);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
var timestampOffsetParam = string.Empty;
|
if (state.IsOutputVideo && !string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase) && (state.Request.StartTimeTicks ?? 0) > 0)
|
||||||
if (state.IsOutputVideo)
|
|
||||||
{
|
{
|
||||||
timestampOffsetParam = " -output_ts_offset " + MediaEncoder.GetTimeParameter(state.Request.StartTimeTicks ?? 0).ToString(CultureInfo.InvariantCulture);
|
timestampOffsetParam = " -output_ts_offset " + MediaEncoder.GetTimeParameter(state.Request.StartTimeTicks ?? 0).ToString(CultureInfo.InvariantCulture);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var mapArgs = state.IsOutputVideo ? GetMapArgs(state) : string.Empty;
|
var mapArgs = state.IsOutputVideo ? GetMapArgs(state) : string.Empty;
|
||||||
|
|
||||||
|
@ -962,6 +969,11 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (string.Equals(state.OutputAudioCodec, "copy", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return state.RunTimeTicks.HasValue && state.IsOutputVideo;
|
return state.RunTimeTicks.HasValue && state.IsOutputVideo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -259,6 +259,9 @@
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
<BundleResource Include="Resources\appicon.icns" />
|
<BundleResource Include="Resources\appicon.icns" />
|
||||||
<BundleResource Include="Resources\MediaBrowser.Server.Mac\Images.xcassets\AppIcon.appiconset\Contents.json" />
|
<BundleResource Include="Resources\MediaBrowser.Server.Mac\Images.xcassets\AppIcon.appiconset\Contents.json" />
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\.DS_Store">
|
||||||
|
<Link>Resources\dashboard-ui\.DS_Store</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\about.html">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\about.html">
|
||||||
<Link>Resources\dashboard-ui\about.html</Link>
|
<Link>Resources\dashboard-ui\about.html</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -652,6 +655,9 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizarduser.html">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizarduser.html">
|
||||||
<Link>Resources\dashboard-ui\wizarduser.html</Link>
|
<Link>Resources\dashboard-ui\wizarduser.html</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\.DS_Store">
|
||||||
|
<Link>Resources\dashboard-ui\css\.DS_Store</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\card.css">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\card.css">
|
||||||
<Link>Resources\dashboard-ui\css\card.css</Link>
|
<Link>Resources\dashboard-ui\css\card.css</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -1672,6 +1678,9 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\connectsdk.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\connectsdk.js">
|
||||||
<Link>Resources\dashboard-ui\thirdparty\cordova\connectsdk.js</Link>
|
<Link>Resources\dashboard-ui\thirdparty\cordova\connectsdk.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\externalplayer.js">
|
||||||
|
<Link>Resources\dashboard-ui\thirdparty\cordova\externalplayer.js</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\generaldevice.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\generaldevice.js">
|
||||||
<Link>Resources\dashboard-ui\thirdparty\cordova\generaldevice.js</Link>
|
<Link>Resources\dashboard-ui\thirdparty\cordova\generaldevice.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -1687,6 +1696,9 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\serverdiscovery.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\serverdiscovery.js">
|
||||||
<Link>Resources\dashboard-ui\thirdparty\cordova\serverdiscovery.js</Link>
|
<Link>Resources\dashboard-ui\thirdparty\cordova\serverdiscovery.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\immersive.js">
|
||||||
|
<Link>Resources\dashboard-ui\thirdparty\cordova\android\immersive.js</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css">
|
||||||
<Link>Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css</Link>
|
<Link>Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.0.*")]
|
//[assembly: AssemblyVersion("3.0.*")]
|
||||||
[assembly: AssemblyVersion("3.0.5621.3")]
|
[assembly: AssemblyVersion("3.0.5621.4")]
|
||||||
|
|
Loading…
Reference in a new issue