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

exclude mpeg4 with level -99 from vaapi

Browse Source
This commit is contained in:
Luke Pulverenti 2016-10-20 02:36:34 -04:00
parent b1f604b5e7
commit ccaf2f43a6
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -317,13 +317,32 @@ namespace MediaBrowser.Api.Playback
}
if (string.Equals(hwType, "vaapi", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(encodingOptions.VaapiDevice))
{
return GetAvailableEncoder("h264_vaapi", defaultEncoder);
if (IsVaapiSupported(state))
{
return GetAvailableEncoder("h264_vaapi", defaultEncoder);
}
}
}
return defaultEncoder;
}
private bool IsVaapiSupported(StreamState state)
{
var videoStream = state.VideoStream;
if (videoStream != null)
{
// vaapi will throw an error with this input
// [vaapi @ 0x7faed8000960] No VAAPI support for codec mpeg4 profile -99.
if (string.Equals(videoStream.Codec, "mpeg4", StringComparison.OrdinalIgnoreCase) && videoStream.Level == -99)
{
return false;
}
}
return true;
}
private string GetAvailableEncoder(string preferredEncoder, string defaultEncoder)
{
if (MediaEncoder.SupportsEncoder(preferredEncoder))

21
MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
View File

@ -588,13 +588,32 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
if (string.Equals(hwType, "vaapi", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(options.VaapiDevice))
{
return GetAvailableEncoder(mediaEncoder, "h264_vaapi", defaultEncoder);
if (IsVaapiSupported(state))
{
return GetAvailableEncoder(mediaEncoder, "h264_vaapi", defaultEncoder);
}
}
}
return defaultEncoder;
}
private static bool IsVaapiSupported(EncodingJob state)
{
var videoStream = state.VideoStream;
if (videoStream != null)
{
// vaapi will throw an error with this input
// [vaapi @ 0x7faed8000960] No VAAPI support for codec mpeg4 profile -99.
if (string.Equals(videoStream.Codec, "mpeg4", StringComparison.OrdinalIgnoreCase) && videoStream.Level == -99)
{
return false;
}
}
return true;
}
internal static bool CanStreamCopyVideo(EncodingJobOptions request, MediaStream videoStream)
{
if (videoStream.IsInterlaced)

2
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -1947,7 +1947,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
}
else
{
timers = timers.Where(i => !(i.Item1.Status == RecordingStatus.New));
timers = timers.Where(i => i.Item1.Status != RecordingStatus.New);
}
}