michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fixes #2285 - [BUG] VAAPI Transcoding (Does not work with certain codecs)

Browse Source
This commit is contained in:
Luke Pulverenti 2016-11-13 15:27:09 -05:00
parent 95341c5c96
commit 3c55747cd6
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,9 +336,12 @@ namespace MediaBrowser.Api.Playback
{
// 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)
if (string.Equals(videoStream.Codec, "mpeg4", StringComparison.OrdinalIgnoreCase))
{
return false;
if (videoStream.Level == -99 || videoStream.Level == 15)
{
return false;
}
}
}
return true;

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

@ -606,9 +606,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
// 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)
if (string.Equals(videoStream.Codec, "mpeg4", StringComparison.OrdinalIgnoreCase))
{
return false;
if (videoStream.Level == -99 || videoStream.Level == 15)
{
return false;
}
}
}
return true;

6
RSSDP/RSSDP.nuget.targets Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="EmitMSBuildWarning" BeforeTargets="Build">
<Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
</Target>
</Project>