mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-09 15:20:34 +02:00
Remove workaround for codec capitalization
This is not required anymore as Shaka Player now supports the correct codec strings.
This commit is contained in:
parent
fd022ee685
commit
1635d82345
|
@ -198,13 +198,6 @@ public class DynamicHlsHelper
|
||||||
|
|
||||||
var basicPlaylist = AppendPlaylist(builder, state, playlistUrl, totalBitrate, subtitleGroup);
|
var basicPlaylist = AppendPlaylist(builder, state, playlistUrl, totalBitrate, subtitleGroup);
|
||||||
|
|
||||||
// Provide a workaround for alternative codec string capitalization.
|
|
||||||
var alternativeCodecCapitalizationPlaylist = ApplyCodecCapitalizationWorkaround(state, basicPlaylist.ToString());
|
|
||||||
if (!string.IsNullOrEmpty(alternativeCodecCapitalizationPlaylist))
|
|
||||||
{
|
|
||||||
builder.Append(alternativeCodecCapitalizationPlaylist);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (state.VideoStream is not null && state.VideoRequest is not null)
|
if (state.VideoStream is not null && state.VideoRequest is not null)
|
||||||
{
|
{
|
||||||
var encodingOptions = _serverConfigurationManager.GetEncodingOptions();
|
var encodingOptions = _serverConfigurationManager.GetEncodingOptions();
|
||||||
|
@ -236,14 +229,7 @@ public class DynamicHlsHelper
|
||||||
}
|
}
|
||||||
|
|
||||||
var sdrTotalBitrate = sdrOutputAudioBitrate + sdrOutputVideoBitrate;
|
var sdrTotalBitrate = sdrOutputAudioBitrate + sdrOutputVideoBitrate;
|
||||||
var sdrPlaylist = AppendPlaylist(builder, state, sdrVideoUrl, sdrTotalBitrate, subtitleGroup);
|
AppendPlaylist(builder, state, sdrVideoUrl, sdrTotalBitrate, subtitleGroup);
|
||||||
|
|
||||||
// Provide a workaround for alternative codec string capitalization.
|
|
||||||
alternativeCodecCapitalizationPlaylist = ApplyCodecCapitalizationWorkaround(state, sdrPlaylist.ToString());
|
|
||||||
if (!string.IsNullOrEmpty(alternativeCodecCapitalizationPlaylist))
|
|
||||||
{
|
|
||||||
builder.Append(alternativeCodecCapitalizationPlaylist);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Restore the video codec
|
// Restore the video codec
|
||||||
state.OutputVideoCodec = "copy";
|
state.OutputVideoCodec = "copy";
|
||||||
|
@ -274,13 +260,6 @@ public class DynamicHlsHelper
|
||||||
state.VideoStream.Level = originalLevel;
|
state.VideoStream.Level = originalLevel;
|
||||||
var newPlaylist = ReplacePlaylistCodecsField(basicPlaylist, playlistCodecsField, newPlaylistCodecsField);
|
var newPlaylist = ReplacePlaylistCodecsField(basicPlaylist, playlistCodecsField, newPlaylistCodecsField);
|
||||||
builder.Append(newPlaylist);
|
builder.Append(newPlaylist);
|
||||||
|
|
||||||
// Provide a workaround for alternative codec string capitalization.
|
|
||||||
alternativeCodecCapitalizationPlaylist = ApplyCodecCapitalizationWorkaround(state, newPlaylist);
|
|
||||||
if (!string.IsNullOrEmpty(alternativeCodecCapitalizationPlaylist))
|
|
||||||
{
|
|
||||||
builder.Append(alternativeCodecCapitalizationPlaylist);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -767,21 +746,4 @@ public class DynamicHlsHelper
|
||||||
newValue.ToString(),
|
newValue.ToString(),
|
||||||
StringComparison.Ordinal);
|
StringComparison.Ordinal);
|
||||||
}
|
}
|
||||||
|
|
||||||
private string ApplyCodecCapitalizationWorkaround(StreamState state, string srcPlaylist)
|
|
||||||
{
|
|
||||||
if (!string.Equals(state.ActualOutputAudioCodec, "flac", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return string.Empty;
|
|
||||||
}
|
|
||||||
|
|
||||||
var newPlaylist = srcPlaylist;
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue