diff options
| author | Bond-009 <bond.009@outlook.com> | 2022-05-08 21:06:03 +0200 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2022-05-20 18:30:57 -0400 |
| commit | b1b83d8111793245b9b3c738574b0e43bbddd0c4 (patch) | |
| tree | 08b1c59a146dbd2bc2781de0e321d6868ff498a7 /Jellyfin.Api/Controllers/DynamicHlsController.cs | |
| parent | 1922ee153e4149530875686212353de578a2932a (diff) | |
Merge pull request #7718 from jellyfin/dovi-hevc-remux
(cherry picked from commit f7ef7d9eda71d42dce46c91f1398eccc0b4b1b6c)
Signed-off-by: crobibero <cody@robibe.ro>
Diffstat (limited to 'Jellyfin.Api/Controllers/DynamicHlsController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/DynamicHlsController.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs index f8e8d975c..6347b908c 100644 --- a/Jellyfin.Api/Controllers/DynamicHlsController.cs +++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs @@ -1773,13 +1773,23 @@ namespace Jellyfin.Api.Controllers var args = "-codec:v:0 " + codec; - // Prefer hvc1 to hev1. if (string.Equals(state.ActualOutputVideoCodec, "h265", StringComparison.OrdinalIgnoreCase) || string.Equals(state.ActualOutputVideoCodec, "hevc", StringComparison.OrdinalIgnoreCase) || string.Equals(codec, "h265", 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) |