lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

limit videos for keyframe extraction

Browse Source
This commit is contained in:
Luke Pulverenti 2015-09-08 16:40:48 -04:00
parent 976a4c22da
commit 29caf70fee
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -7,6 +7,7 @@ using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Controller.Session; using MediaBrowser.Controller.Session;
using MediaBrowser.MediaEncoding.Probing; using MediaBrowser.MediaEncoding.Probing;
using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Extensions; using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
@ -247,10 +248,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{ {
foreach (var stream in mediaInfo.MediaStreams) foreach (var stream in mediaInfo.MediaStreams)
{ {
if (stream.Type == MediaStreamType.Video && if (EnableKeyframeExtraction(mediaInfo, stream))
string.Equals(stream.Codec, "h264", StringComparison.OrdinalIgnoreCase) &&
!stream.IsInterlaced &&
!(stream.IsAnamorphic ?? false))
{ {
try try
{ {
@ -287,6 +285,25 @@ namespace MediaBrowser.MediaEncoding.Encoder
throw new ApplicationException(string.Format("FFProbe failed for {0}", inputPath)); throw new ApplicationException(string.Format("FFProbe failed for {0}", inputPath));
} }
private bool EnableKeyframeExtraction(MediaSourceInfo mediaSource, MediaStream videoStream)
{
if (videoStream.Type == MediaStreamType.Video && string.Equals(videoStream.Codec, "h264", StringComparison.OrdinalIgnoreCase) &&
!videoStream.IsInterlaced &&
!(videoStream.IsAnamorphic ?? false))
{
var audioStreams = mediaSource.MediaStreams.Where(i => i.Type == MediaStreamType.Audio).ToList();
// If it has aac audio then it will probably direct stream anyway, so don't bother with this
if (audioStreams.Count == 1 && string.Equals(audioStreams[0].Codec, "aac", StringComparison.OrdinalIgnoreCase))
{
return false;
}
return true;
}
return false;
}
private async Task<List<int>> GetKeyFrames(string inputPath, int videoStreamIndex, CancellationToken cancellationToken) private async Task<List<int>> GetKeyFrames(string inputPath, int videoStreamIndex, CancellationToken cancellationToken)
{ {
inputPath = inputPath.Split(new[] { ':' }, 2).Last().Trim('"'); inputPath = inputPath.Split(new[] { ':' }, 2).Last().Trim('"');
@ -313,7 +330,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
EnableRaisingEvents = true EnableRaisingEvents = true
}; };
_logger.Debug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments); _logger.Info("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
using (process) using (process)
{ {
@ -339,7 +356,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
process.WaitForExit(); process.WaitForExit();
_logger.Debug("Keyframe extraction took {0} seconds", (DateTime.UtcNow - start).TotalSeconds); _logger.Info("Keyframe extraction took {0} seconds", (DateTime.UtcNow - start).TotalSeconds);
//_logger.Debug("Found keyframes {0}", string.Join(",", lines.ToArray())); //_logger.Debug("Found keyframes {0}", string.Join(",", lines.ToArray()));
return lines; return lines;
} }

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -2649,6 +2649,9 @@
<Content Include="dashboard-ui\strings\javascript\zh-TW.json"> <Content Include="dashboard-ui\strings\javascript\zh-TW.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="dashboard-ui\strings\html\zh-HK.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="dashboard-ui\thirdparty\fontawesome\css\font-awesome.css.map"> <None Include="dashboard-ui\thirdparty\fontawesome\css\font-awesome.css.map">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>