From 19fb061381dd107d5e0236cf9d8b59b2e2318130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=BCller?= <github@lonebyte.de>
Date: Tue, 1 Aug 2023 17:22:42 +0200
Subject: [PATCH] Correct the HLS Opus codec string

Apple doesn't support Opus via HLS yet, but if they ever do, they will
definitely expect "Opus" instead of "opus".

See https://mp4ra.org/#/codecs

Fixes: #10066
---
 Jellyfin.Api/Helpers/DynamicHlsHelper.cs      | 28 ++++++++++---------
 Jellyfin.Api/Helpers/HlsCodecStringHelpers.cs |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
index dfcccddfc2..888b667a68 100644
--- a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
+++ b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
@@ -198,11 +198,11 @@ public class DynamicHlsHelper
 
         var basicPlaylist = AppendPlaylist(builder, state, playlistUrl, totalBitrate, subtitleGroup);
 
-        // Provide a workaround for the case issue between flac and fLaC.
-        var flacWaPlaylist = ApplyFlacCaseWorkaround(state, basicPlaylist.ToString());
-        if (!string.IsNullOrEmpty(flacWaPlaylist))
+        // Provide a workaround for alternative codec string capitalization.
+        var alternativeCodecCapitalizationPlaylist = ApplyCodecCapitalizationWorkaround(state, basicPlaylist.ToString());
+        if (!string.IsNullOrEmpty(alternativeCodecCapitalizationPlaylist))
         {
-            builder.Append(flacWaPlaylist);
+            builder.Append(alternativeCodecCapitalizationPlaylist);
         }
 
         if (state.VideoStream is not null && state.VideoRequest is not null)
@@ -238,11 +238,11 @@ public class DynamicHlsHelper
                     var sdrTotalBitrate = sdrOutputAudioBitrate + sdrOutputVideoBitrate;
                     var sdrPlaylist = AppendPlaylist(builder, state, sdrVideoUrl, sdrTotalBitrate, subtitleGroup);
 
-                    // Provide a workaround for the case issue between flac and fLaC.
-                    flacWaPlaylist = ApplyFlacCaseWorkaround(state, sdrPlaylist.ToString());
-                    if (!string.IsNullOrEmpty(flacWaPlaylist))
+                    // Provide a workaround for alternative codec string capitalization.
+                    alternativeCodecCapitalizationPlaylist = ApplyCodecCapitalizationWorkaround(state, sdrPlaylist.ToString());
+                    if (!string.IsNullOrEmpty(alternativeCodecCapitalizationPlaylist))
                     {
-                        builder.Append(flacWaPlaylist);
+                        builder.Append(alternativeCodecCapitalizationPlaylist);
                     }
 
                     // Restore the video codec
@@ -275,11 +275,11 @@ public class DynamicHlsHelper
                 var newPlaylist = ReplacePlaylistCodecsField(basicPlaylist, playlistCodecsField, newPlaylistCodecsField);
                 builder.Append(newPlaylist);
 
-                // Provide a workaround for the case issue between flac and fLaC.
-                flacWaPlaylist = ApplyFlacCaseWorkaround(state, newPlaylist);
-                if (!string.IsNullOrEmpty(flacWaPlaylist))
+                // Provide a workaround for alternative codec string capitalization.
+                alternativeCodecCapitalizationPlaylist = ApplyCodecCapitalizationWorkaround(state, newPlaylist);
+                if (!string.IsNullOrEmpty(alternativeCodecCapitalizationPlaylist))
                 {
-                    builder.Append(flacWaPlaylist);
+                    builder.Append(alternativeCodecCapitalizationPlaylist);
                 }
             }
         }
@@ -768,7 +768,7 @@ public class DynamicHlsHelper
             StringComparison.Ordinal);
     }
 
-    private string ApplyFlacCaseWorkaround(StreamState state, string srcPlaylist)
+    private string ApplyCodecCapitalizationWorkaround(StreamState state, string srcPlaylist)
     {
         if (!string.Equals(state.ActualOutputAudioCodec, "flac", StringComparison.OrdinalIgnoreCase))
         {
@@ -779,6 +779,8 @@ public class DynamicHlsHelper
 
         newPlaylist = newPlaylist.Replace(",fLaC\"", ",flac\"", StringComparison.Ordinal);
         newPlaylist = newPlaylist.Replace("\"fLaC\"", "\"flac\"", StringComparison.Ordinal);
+        newPlaylist = newPlaylist.Replace(",Opus\"", ",opus\"", StringComparison.Ordinal);
+        newPlaylist = newPlaylist.Replace("\"Opus\"", "\"opus\"", StringComparison.Ordinal);
 
         return string.Equals(srcPlaylist, newPlaylist, StringComparison.Ordinal) ? string.Empty : newPlaylist;
     }
diff --git a/Jellyfin.Api/Helpers/HlsCodecStringHelpers.cs b/Jellyfin.Api/Helpers/HlsCodecStringHelpers.cs
index 9b1c52045f..5eec1b0ca6 100644
--- a/Jellyfin.Api/Helpers/HlsCodecStringHelpers.cs
+++ b/Jellyfin.Api/Helpers/HlsCodecStringHelpers.cs
@@ -39,7 +39,7 @@ public static class HlsCodecStringHelpers
     /// <summary>
     /// Codec name for OPUS.
     /// </summary>
-    public const string OPUS = "opus";
+    public const string OPUS = "Opus";
 
     /// <summary>
     /// Gets a MP3 codec string.