aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorgnattu <gnattu@users.noreply.github.com>2024-09-08 11:08:54 +0800
committerGitHub <noreply@github.com>2024-09-07 21:08:54 -0600
commitb4f71859d939c5c0fa0a155f712d25cba0c20b8f (patch)
tree53dbe8574abc918c8348682024bab0815619a37f /MediaBrowser.Model
parent84b20afe1fc6cb86d9ff8694b3e4524461dea588 (diff)
Make Live TV compatibility profiles customizable (#12529)
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs1
-rw-r--r--MediaBrowser.Model/Dto/MediaSourceInfo.cs7
-rw-r--r--MediaBrowser.Model/LiveTv/TunerHostInfo.cs9
3 files changed, 17 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index ad00149e0..c18becf72 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -805,6 +805,7 @@ namespace MediaBrowser.Model.Dlna
}
var transcodingProfiles = options.Profile.TranscodingProfiles
+ .Where(i => !item.UseMostCompatibleTranscodingProfile || string.Equals(i.Container, "ts", StringComparison.OrdinalIgnoreCase))
.Where(i => i.Type == playlistItem.MediaType && i.Context == options.Context);
if (options.AllowVideoStreamCopy)
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 1c6037325..eff2e09da 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Text.Json.Serialization;
using Jellyfin.Data.Enums;
using MediaBrowser.Model.Dlna;
@@ -24,6 +25,7 @@ namespace MediaBrowser.Model.Dto
SupportsDirectStream = true;
SupportsDirectPlay = true;
SupportsProbing = true;
+ UseMostCompatibleTranscodingProfile = false;
}
public MediaProtocol Protocol { get; set; }
@@ -70,6 +72,9 @@ namespace MediaBrowser.Model.Dto
public bool IsInfiniteStream { get; set; }
+ [DefaultValue(false)]
+ public bool UseMostCompatibleTranscodingProfile { get; set; }
+
public bool RequiresOpening { get; set; }
public string OpenToken { get; set; }
@@ -98,6 +103,8 @@ namespace MediaBrowser.Model.Dto
public int? Bitrate { get; set; }
+ public int? FallbackMaxStreamingBitrate { get; set; }
+
public TransportStreamTimestamp? Timestamp { get; set; }
public Dictionary<string, string> RequiredHttpHeaders { get; set; }
diff --git a/MediaBrowser.Model/LiveTv/TunerHostInfo.cs b/MediaBrowser.Model/LiveTv/TunerHostInfo.cs
index a832169c2..a355387b1 100644
--- a/MediaBrowser.Model/LiveTv/TunerHostInfo.cs
+++ b/MediaBrowser.Model/LiveTv/TunerHostInfo.cs
@@ -9,6 +9,9 @@ namespace MediaBrowser.Model.LiveTv
{
AllowHWTranscoding = true;
IgnoreDts = true;
+ AllowStreamSharing = true;
+ AllowFmp4TranscodingContainer = false;
+ FallbackMaxStreamingBitrate = 30000000;
}
public string Id { get; set; }
@@ -25,6 +28,12 @@ namespace MediaBrowser.Model.LiveTv
public bool AllowHWTranscoding { get; set; }
+ public bool AllowFmp4TranscodingContainer { get; set; }
+
+ public bool AllowStreamSharing { get; set; }
+
+ public int FallbackMaxStreamingBitrate { get; set; }
+
public bool EnableStreamLooping { get; set; }
public string Source { get; set; }