mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 11:57:55 +02:00
Fix naming of nvenc codecs. It should be nvenc_h264.
This commit is contained in:
parent
c811d57bca
commit
c1208a2f8d
2 changed files with 6 additions and 6 deletions
|
@ -50,7 +50,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
|
|
||||||
if (string.Equals(hwType, "nvenc", StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(hwType, "nvenc", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
return GetAvailableEncoder("h264_nvenc", defaultEncoder);
|
return GetAvailableEncoder("nvenc_h264", defaultEncoder);
|
||||||
}
|
}
|
||||||
if (string.Equals(hwType, "h264_omx", StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(hwType, "h264_omx", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
|
@ -591,8 +591,8 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// h264 (h264_nvenc)
|
// h264 (nvenc_h264)
|
||||||
else if (string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase))
|
else if (string.Equals(videoEncoder, "nvenc_h264", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
param += "-preset default";
|
param += "-preset default";
|
||||||
}
|
}
|
||||||
|
@ -670,10 +670,10 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
{
|
{
|
||||||
var level = NormalizeTranscodingLevel(state.OutputVideoCodec, request.Level);
|
var level = NormalizeTranscodingLevel(state.OutputVideoCodec, request.Level);
|
||||||
|
|
||||||
// h264_qsv and h264_nvenc expect levels to be expressed as a decimal. libx264 supports decimal and non-decimal format
|
// h264_qsv and nvenc_h264 expect levels to be expressed as a decimal. libx264 supports decimal and non-decimal format
|
||||||
// also needed for libx264 due to https://trac.ffmpeg.org/ticket/3307
|
// also needed for libx264 due to https://trac.ffmpeg.org/ticket/3307
|
||||||
if (string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) ||
|
if (string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) ||
|
||||||
string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase) ||
|
string.Equals(videoEncoder, "nvenc_h264", StringComparison.OrdinalIgnoreCase) ||
|
||||||
string.Equals(videoEncoder, "libx264", StringComparison.OrdinalIgnoreCase))
|
string.Equals(videoEncoder, "libx264", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
switch (level)
|
switch (level)
|
||||||
|
|
|
@ -133,7 +133,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
"libopus",
|
"libopus",
|
||||||
"libvorbis",
|
"libvorbis",
|
||||||
"srt",
|
"srt",
|
||||||
"h264_nvenc",
|
"nvenc_h264",
|
||||||
"h264_qsv",
|
"h264_qsv",
|
||||||
"h264_omx",
|
"h264_omx",
|
||||||
"h264_vaapi",
|
"h264_vaapi",
|
||||||
|
|
Loading…
Reference in a new issue