Firehawk52-backup/jellyfin
28
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 08:23:28 -03:00
Code Issues Packages Projects Releases Wiki Activity

Reduce allocations, simplifed code, faster implementation, included tests - StreamInfo.ToUrl (#9369)

Browse Source 
* Rework PR 6168

* Fix test
This commit is contained in:
Tim Eisele
2025-03-28 13:51:44 +01:00
committed by GitHub
parent cb931e0062
commit 9657708b38
8 changed files with 735 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@@ -800,7 +800,7 @@ namespace MediaBrowser.Model.Dlna
options.SubtitleStreamIndex,
playlistItem.PlayMethod,
playlistItem.TranscodeReasons,
playlistItem.ToUrl("media:", "<token>"));
playlistItem.ToUrl("media:", "<token>", null));
item.Container = NormalizeMediaSourceFormatIntoSingleContainer(item.Container, options.Profile, DlnaProfileType.Video, directPlayProfile);
return playlistItem;

400
MediaBrowser.Model/Dlna/StreamInfo.cs
View File

@@ -1,7 +1,12 @@
#pragma warning disable CA1819 // Properties should not return arrays
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using Jellyfin.Data.Enums;
using Jellyfin.Extensions;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
@@ -871,202 +876,279 @@ public class StreamInfo
/// </summary>
/// <param name="baseUrl">The base Url.</param>
/// <param name="accessToken">The access Token.</param>
/// <param name="query">Optional extra query.</param>
/// <returns>A querystring representation of this object.</returns>
public string ToUrl(string baseUrl, string? accessToken)
public string ToUrl(string? baseUrl, string? accessToken, string? query)
{
ArgumentException.ThrowIfNullOrEmpty(baseUrl);
List<string> list = [];
foreach (NameValuePair pair in BuildParams(this, accessToken))
var sb = new StringBuilder();
if (!string.IsNullOrEmpty(baseUrl))
{
if (string.IsNullOrEmpty(pair.Value))
{
continue;
}
// Try to keep the url clean by omitting defaults
if (string.Equals(pair.Name, "StartTimeTicks", StringComparison.OrdinalIgnoreCase)
&& string.Equals(pair.Value, "0", StringComparison.OrdinalIgnoreCase))
{
continue;
}
if (string.Equals(pair.Name, "SubtitleStreamIndex", StringComparison.OrdinalIgnoreCase)
&& string.Equals(pair.Value, "-1", StringComparison.OrdinalIgnoreCase))
{
continue;
}
if (string.Equals(pair.Name, "Static", StringComparison.OrdinalIgnoreCase)
&& string.Equals(pair.Value, "false", StringComparison.OrdinalIgnoreCase))
{
continue;
}
var encodedValue = pair.Value.Replace(" ", "%20", StringComparison.Ordinal);
list.Add(string.Format(CultureInfo.InvariantCulture, "{0}={1}", pair.Name, encodedValue));
sb.Append(baseUrl.TrimEnd('/'));
}
string queryString = string.Join('&', list);
return GetUrl(baseUrl, queryString);
}
private string GetUrl(string baseUrl, string queryString)
{
ArgumentException.ThrowIfNullOrEmpty(baseUrl);
string extension = string.IsNullOrEmpty(Container) ? string.Empty : "." + Container;
baseUrl = baseUrl.TrimEnd('/');
if (MediaType == DlnaProfileType.Audio)
{
if (SubProtocol == MediaStreamProtocol.hls)
sb.Append("/audio/");
}
else
{
sb.Append("/videos/");
}
sb.Append(ItemId);
if (SubProtocol == MediaStreamProtocol.hls)
{
sb.Append("/master.m3u8?");
}
else
{
sb.Append("/stream");
if (!string.IsNullOrEmpty(Container))
{
return string.Format(CultureInfo.InvariantCulture, "{0}/audio/{1}/master.m3u8?{2}", baseUrl, ItemId, queryString);
sb.Append('.');
sb.Append(Container);
}
return string.Format(CultureInfo.InvariantCulture, "{0}/audio/{1}/stream{2}?{3}", baseUrl, ItemId, extension, queryString);
sb.Append('?');
}
if (!string.IsNullOrEmpty(DeviceProfileId))
{
sb.Append("&DeviceProfileId=");
sb.Append(DeviceProfileId);
}
if (!string.IsNullOrEmpty(DeviceId))
{
sb.Append("&DeviceId=");
sb.Append(DeviceId);
}
if (!string.IsNullOrEmpty(MediaSourceId))
{
sb.Append("&MediaSourceId=");
sb.Append(MediaSourceId);
}
// default true so don't store.
if (IsDirectStream)
{
sb.Append("&Static=true");
}
if (VideoCodecs.Count != 0)
{
sb.Append("&VideoCodec=");
sb.AppendJoin(',', VideoCodecs);
}
if (AudioCodecs.Count != 0)
{
sb.Append("&AudioCodec=");
sb.AppendJoin(',', AudioCodecs);
}
if (AudioStreamIndex.HasValue)
{
sb.Append("&AudioStreamIndex=");
sb.Append(AudioStreamIndex.Value.ToString(CultureInfo.InvariantCulture));
}
if (SubtitleStreamIndex.HasValue && SubtitleDeliveryMethod != SubtitleDeliveryMethod.External && SubtitleStreamIndex != -1)
{
sb.Append("&SubtitleStreamIndex=");
sb.Append(SubtitleStreamIndex.Value.ToString(CultureInfo.InvariantCulture));
sb.Append("&SubtitleMethod=");
sb.Append(SubtitleDeliveryMethod.ToString());
}
if (VideoBitrate.HasValue)
{
sb.Append("&VideoBitrate=");
sb.Append(VideoBitrate.Value.ToString(CultureInfo.InvariantCulture));
}
if (AudioBitrate.HasValue)
{
sb.Append("&AudioBitrate=");
sb.Append(AudioBitrate.Value.ToString(CultureInfo.InvariantCulture));
}
if (AudioSampleRate.HasValue)
{
sb.Append("&AudioSampleRate=");
sb.Append(AudioSampleRate.Value.ToString(CultureInfo.InvariantCulture));
}
if (MaxFramerate.HasValue)
{
sb.Append("&MaxFramerate=");
sb.Append(MaxFramerate.Value.ToString(CultureInfo.InvariantCulture));
}
if (MaxWidth.HasValue)
{
sb.Append("&MaxWidth=");
sb.Append(MaxWidth.Value.ToString(CultureInfo.InvariantCulture));
}
if (MaxHeight.HasValue)
{
sb.Append("&MaxHeight=");
sb.Append(MaxHeight.Value.ToString(CultureInfo.InvariantCulture));
}
if (SubProtocol == MediaStreamProtocol.hls)
{
return string.Format(CultureInfo.InvariantCulture, "{0}/videos/{1}/master.m3u8?{2}", baseUrl, ItemId, queryString);
}
if (!string.IsNullOrEmpty(Container))
{
sb.Append("&SegmentContainer=");
sb.Append(Container);
}
return string.Format(CultureInfo.InvariantCulture, "{0}/videos/{1}/stream{2}?{3}", baseUrl, ItemId, extension, queryString);
}
if (SegmentLength.HasValue)
{
sb.Append("&SegmentLength=");
sb.Append(SegmentLength.Value.ToString(CultureInfo.InvariantCulture));
}
private static List<NameValuePair> BuildParams(StreamInfo item, string? accessToken)
{
List<NameValuePair> list = [];
if (MinSegments.HasValue)
{
sb.Append("&MinSegments=");
sb.Append(MinSegments.Value.ToString(CultureInfo.InvariantCulture));
}
string audioCodecs = item.AudioCodecs.Count == 0 ?
string.Empty :
string.Join(',', item.AudioCodecs);
string videoCodecs = item.VideoCodecs.Count == 0 ?
string.Empty :
string.Join(',', item.VideoCodecs);
list.Add(new NameValuePair("DeviceProfileId", item.DeviceProfileId ?? string.Empty));
list.Add(new NameValuePair("DeviceId", item.DeviceId ?? string.Empty));
list.Add(new NameValuePair("MediaSourceId", item.MediaSourceId ?? string.Empty));
list.Add(new NameValuePair("Static", item.IsDirectStream.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()));
list.Add(new NameValuePair("VideoCodec", videoCodecs));
list.Add(new NameValuePair("AudioCodec", audioCodecs));
list.Add(new NameValuePair("AudioStreamIndex", item.AudioStreamIndex.HasValue ? item.AudioStreamIndex.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
list.Add(new NameValuePair("SubtitleStreamIndex", item.SubtitleStreamIndex.HasValue && (item.AlwaysBurnInSubtitleWhenTranscoding || item.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External) ? item.SubtitleStreamIndex.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
list.Add(new NameValuePair("VideoBitrate", item.VideoBitrate.HasValue ? item.VideoBitrate.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
list.Add(new NameValuePair("AudioBitrate", item.AudioBitrate.HasValue ? item.AudioBitrate.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
list.Add(new NameValuePair("AudioSampleRate", item.AudioSampleRate.HasValue ? item.AudioSampleRate.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
list.Add(new NameValuePair("MaxFramerate", item.MaxFramerate.HasValue ? item.MaxFramerate.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
list.Add(new NameValuePair("MaxWidth", item.MaxWidth.HasValue ? item.MaxWidth.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
list.Add(new NameValuePair("MaxHeight", item.MaxHeight.HasValue ? item.MaxHeight.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
long startPositionTicks = item.StartPositionTicks;
if (item.SubProtocol == MediaStreamProtocol.hls)
{
list.Add(new NameValuePair("StartTimeTicks", string.Empty));
sb.Append("&BreakOnNonKeyFrames=");
sb.Append(BreakOnNonKeyFrames.ToString(CultureInfo.InvariantCulture));
}
else
{
list.Add(new NameValuePair("StartTimeTicks", startPositionTicks.ToString(CultureInfo.InvariantCulture)));
if (StartPositionTicks != 0)
{
sb.Append("&StartTimeTicks=");
sb.Append(StartPositionTicks.ToString(CultureInfo.InvariantCulture));
}
}
list.Add(new NameValuePair("PlaySessionId", item.PlaySessionId ?? string.Empty));
list.Add(new NameValuePair("ApiKey", accessToken ?? string.Empty));
string? liveStreamId = item.MediaSource?.LiveStreamId;
list.Add(new NameValuePair("LiveStreamId", liveStreamId ?? string.Empty));
list.Add(new NameValuePair("SubtitleMethod", item.SubtitleStreamIndex.HasValue && item.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External ? item.SubtitleDeliveryMethod.ToString() : string.Empty));
if (!item.IsDirectStream)
if (!string.IsNullOrEmpty(PlaySessionId))
{
if (item.RequireNonAnamorphic)
{
list.Add(new NameValuePair("RequireNonAnamorphic", item.RequireNonAnamorphic.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()));
}
list.Add(new NameValuePair("TranscodingMaxAudioChannels", item.TranscodingMaxAudioChannels.HasValue ? item.TranscodingMaxAudioChannels.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
if (item.EnableSubtitlesInManifest)
{
list.Add(new NameValuePair("EnableSubtitlesInManifest", item.EnableSubtitlesInManifest.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()));
}
if (item.EnableMpegtsM2TsMode)
{
list.Add(new NameValuePair("EnableMpegtsM2TsMode", item.EnableMpegtsM2TsMode.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()));
}
if (item.EstimateContentLength)
{
list.Add(new NameValuePair("EstimateContentLength", item.EstimateContentLength.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()));
}
if (item.TranscodeSeekInfo != TranscodeSeekInfo.Auto)
{
list.Add(new NameValuePair("TranscodeSeekInfo", item.TranscodeSeekInfo.ToString().ToLowerInvariant()));
}
if (item.CopyTimestamps)
{
list.Add(new NameValuePair("CopyTimestamps", item.CopyTimestamps.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()));
}
list.Add(new NameValuePair("RequireAvc", item.RequireAvc.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()));
list.Add(new NameValuePair("EnableAudioVbrEncoding", item.EnableAudioVbrEncoding.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()));
sb.Append("&PlaySessionId=");
sb.Append(PlaySessionId);
}
list.Add(new NameValuePair("Tag", item.MediaSource?.ETag ?? string.Empty));
string subtitleCodecs = item.SubtitleCodecs.Count == 0 ?
string.Empty :
string.Join(",", item.SubtitleCodecs);
list.Add(new NameValuePair("SubtitleCodec", item.SubtitleStreamIndex.HasValue && item.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Embed ? subtitleCodecs : string.Empty));
if (item.SubProtocol == MediaStreamProtocol.hls)
if (!string.IsNullOrEmpty(accessToken))
{
list.Add(new NameValuePair("SegmentContainer", item.Container ?? string.Empty));
if (item.SegmentLength.HasValue)
{
list.Add(new NameValuePair("SegmentLength", item.SegmentLength.Value.ToString(CultureInfo.InvariantCulture)));
}
if (item.MinSegments.HasValue)
{
list.Add(new NameValuePair("MinSegments", item.MinSegments.Value.ToString(CultureInfo.InvariantCulture)));
}
list.Add(new NameValuePair("BreakOnNonKeyFrames", item.BreakOnNonKeyFrames.ToString(CultureInfo.InvariantCulture)));
sb.Append("&ApiKey=");
sb.Append(accessToken);
}
foreach (var pair in item.StreamOptions)
var liveStreamId = MediaSource?.LiveStreamId;
if (!string.IsNullOrEmpty(liveStreamId))
{
if (string.IsNullOrEmpty(pair.Value))
sb.Append("&LiveStreamId=");
sb.Append(liveStreamId);
}
if (!IsDirectStream)
{
if (RequireNonAnamorphic)
{
continue;
sb.Append("&RequireNonAnamorphic=");
sb.Append(RequireNonAnamorphic.ToString(CultureInfo.InvariantCulture));
}
// strip spaces to avoid having to encode h264 profile names
list.Add(new NameValuePair(pair.Key, pair.Value.Replace(" ", string.Empty, StringComparison.Ordinal)));
if (TranscodingMaxAudioChannels.HasValue)
{
sb.Append("&TranscodingMaxAudioChannels=");
sb.Append(TranscodingMaxAudioChannels.Value.ToString(CultureInfo.InvariantCulture));
}
if (EnableSubtitlesInManifest)
{
sb.Append("&EnableSubtitlesInManifest=");
sb.Append(EnableSubtitlesInManifest.ToString(CultureInfo.InvariantCulture));
}
if (EnableMpegtsM2TsMode)
{
sb.Append("&EnableMpegtsM2TsMode=");
sb.Append(EnableMpegtsM2TsMode.ToString(CultureInfo.InvariantCulture));
}
if (EstimateContentLength)
{
sb.Append("&EstimateContentLength=");
sb.Append(EstimateContentLength.ToString(CultureInfo.InvariantCulture));
}
if (TranscodeSeekInfo != TranscodeSeekInfo.Auto)
{
sb.Append("&TranscodeSeekInfo=");
sb.Append(TranscodeSeekInfo.ToString());
}
if (CopyTimestamps)
{
sb.Append("&CopyTimestamps=");
sb.Append(CopyTimestamps.ToString(CultureInfo.InvariantCulture));
}
if (RequireAvc)
{
sb.Append("&RequireAvc=");
sb.Append(RequireAvc.ToString(CultureInfo.InvariantCulture));
}
if (EnableAudioVbrEncoding)
{
sb.Append("EnableAudioVbrEncoding=");
sb.Append(EnableAudioVbrEncoding.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
}
}
if (!item.IsDirectStream)
var etag = MediaSource?.ETag;
if (!string.IsNullOrEmpty(etag))
{
list.Add(new NameValuePair("TranscodeReasons", item.TranscodeReasons.ToString()));
sb.Append("&Tag=");
sb.Append(etag);
}
return list;
if (SubtitleStreamIndex.HasValue && SubtitleDeliveryMethod != SubtitleDeliveryMethod.External)
{
sb.Append("&SubtitleMethod=");
sb.AppendJoin(',', SubtitleDeliveryMethod);
}
if (SubtitleStreamIndex.HasValue && SubtitleDeliveryMethod == SubtitleDeliveryMethod.Embed && SubtitleCodecs.Count != 0)
{
sb.Append("&SubtitleCodec=");
sb.AppendJoin(',', SubtitleCodecs);
}
foreach (var pair in StreamOptions)
{
// Strip spaces to avoid having to encode h264 profile names
sb.Append('&');
sb.Append(pair.Key);
sb.Append('=');
sb.Append(pair.Value.Replace(" ", string.Empty, StringComparison.Ordinal));
}
var transcodeReasonsValues = TranscodeReasons.GetUniqueFlags().ToArray();
if (!IsDirectStream && transcodeReasonsValues.Length > 0)
{
sb.Append("&TranscodeReasons=");
sb.AppendJoin(',', transcodeReasonsValues);
}
if (!string.IsNullOrEmpty(query))
{
sb.Append(query);
}
return sb.ToString();
}
/// <summary>

10
MediaBrowser.Model/Dto/MediaSourceInfo.cs
View File

@@ -1,12 +1,10 @@
#nullable disable
#pragma warning disable CS1591
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text.Json.Serialization;
using Jellyfin.Data.Enums;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Session;
@@ -17,10 +15,10 @@ namespace MediaBrowser.Model.Dto
{
public MediaSourceInfo()
{
Formats = Array.Empty<string>();
MediaStreams = Array.Empty<MediaStream>();
MediaAttachments = Array.Empty<MediaAttachment>();
RequiredHttpHeaders = new Dictionary<string, string>();
Formats = [];
MediaStreams = [];
MediaAttachments = [];
RequiredHttpHeaders = [];
SupportsTranscoding = true;
SupportsDirectStream = true;
SupportsDirectPlay = true;