mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-08 23:00:51 +02:00
Merge pull request #7718 from jellyfin/dovi-hevc-remux
This commit is contained in:
commit
f7ef7d9eda
|
@ -1773,13 +1773,23 @@ namespace Jellyfin.Api.Controllers
|
||||||
|
|
||||||
var args = "-codec:v:0 " + codec;
|
var args = "-codec:v:0 " + codec;
|
||||||
|
|
||||||
// Prefer hvc1 to hev1.
|
|
||||||
if (string.Equals(state.ActualOutputVideoCodec, "h265", StringComparison.OrdinalIgnoreCase)
|
if (string.Equals(state.ActualOutputVideoCodec, "h265", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(state.ActualOutputVideoCodec, "hevc", StringComparison.OrdinalIgnoreCase)
|
|| string.Equals(state.ActualOutputVideoCodec, "hevc", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase)
|
|| string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(codec, "hevc", StringComparison.OrdinalIgnoreCase))
|
|| string.Equals(codec, "hevc", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
args += " -tag:v:0 hvc1";
|
if (EncodingHelper.IsCopyCodec(codec)
|
||||||
|
&& (string.Equals(state.VideoStream.CodecTag, "dvh1", StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| string.Equals(state.VideoStream.CodecTag, "dvhe", StringComparison.OrdinalIgnoreCase)))
|
||||||
|
{
|
||||||
|
// Prefer dvh1 to dvhe
|
||||||
|
args += " -tag:v:0 dvh1";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Prefer hvc1 to hev1
|
||||||
|
args += " -tag:v:0 hvc1";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (state.EnableMpegtsM2TsMode)
|
// if (state.EnableMpegtsM2TsMode)
|
||||||
|
|
Loading…
Reference in a new issue