github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2798 from JustAMan/fix-livetv-again

Browse source 
Make localhost LiveTV restreams always use plain HTTP port

(cherry picked from commit f502c89331)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Joshua M. Boniface 2020-04-26 15:13:27 -04:00
parent 3af63bf439
commit a0b053e4a1
6 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Emby.Server.Implementations/ApplicationHost.cs
View file

@ -1422,7 +1422,7 @@ namespace Emby.Server.Implementations
public bool SupportsHttps => Certificate != null || ServerConfigurationManager.Configuration.IsBehindProxy; public bool SupportsHttps => Certificate != null || ServerConfigurationManager.Configuration.IsBehindProxy;
public async Task<string> GetLocalApiUrl(CancellationToken cancellationToken) public async Task<string> GetLocalApiUrl(CancellationToken cancellationToken, bool forceHttp = false)
{ {
try try
{ {
@ -1431,7 +1431,7 @@ namespace Emby.Server.Implementations
foreach (var address in addresses) foreach (var address in addresses)
{ {
return GetLocalApiUrl(address); return GetLocalApiUrl(address, forceHttp);
} }
return null; return null;
@ -1461,7 +1461,7 @@ namespace Emby.Server.Implementations
} }
/// <inheritdoc /> /// <inheritdoc />
public string GetLocalApiUrl(IPAddress ipAddress) public string GetLocalApiUrl(IPAddress ipAddress, bool forceHttp = false)
{ {
if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6) if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
{ {
@ -1471,20 +1471,21 @@ namespace Emby.Server.Implementations
str.CopyTo(span.Slice(1)); str.CopyTo(span.Slice(1));
span[^1] = ']'; span[^1] = ']';
return GetLocalApiUrl(span); return GetLocalApiUrl(span, forceHttp);
} }
return GetLocalApiUrl(ipAddress.ToString()); return GetLocalApiUrl(ipAddress.ToString(), forceHttp);
} }
/// <inheritdoc /> /// <inheritdoc />
public string GetLocalApiUrl(ReadOnlySpan<char> host) public string GetLocalApiUrl(ReadOnlySpan<char> host, bool forceHttp = false)
{ {
var url = new StringBuilder(64); var url = new StringBuilder(64);
url.Append(EnableHttps ? "https://" : "http://") bool useHttps = EnableHttps && !forceHttp;
url.Append(useHttps ? "https://" : "http://")
.Append(host) .Append(host)
.Append(':') .Append(':')
.Append(EnableHttps ? HttpsPort : HttpPort); .Append(useHttps ? HttpsPort : HttpPort);
string baseUrl = ServerConfigurationManager.Configuration.BaseUrl; string baseUrl = ServerConfigurationManager.Configuration.BaseUrl;
if (baseUrl.Length != 0) if (baseUrl.Length != 0)

2
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View file

@ -1063,7 +1063,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{ {
var stream = new MediaSourceInfo var stream = new MediaSourceInfo
{ {
EncoderPath = _appHost.GetLocalApiUrl("127.0.0.1") + "/LiveTv/LiveRecordings/" + info.Id + "/stream", EncoderPath = _appHost.GetLocalApiUrl("127.0.0.1", true) + "/LiveTv/LiveRecordings/" + info.Id + "/stream",
EncoderProtocol = MediaProtocol.Http, EncoderProtocol = MediaProtocol.Http,
Path = info.Path, Path = info.Path,
Protocol = MediaProtocol.File, Protocol = MediaProtocol.File,

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
View file

@ -122,7 +122,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
//OpenedMediaSource.Path = tempFile; //OpenedMediaSource.Path = tempFile;
//OpenedMediaSource.ReadAtNativeFramerate = true; //OpenedMediaSource.ReadAtNativeFramerate = true;
MediaSource.Path = _appHost.GetLocalApiUrl("127.0.0.1") + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts"; MediaSource.Path = _appHost.GetLocalApiUrl("127.0.0.1", true) + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts";
MediaSource.Protocol = MediaProtocol.Http; MediaSource.Protocol = MediaProtocol.Http;
//OpenedMediaSource.SupportsDirectPlay = false; //OpenedMediaSource.SupportsDirectPlay = false;
//OpenedMediaSource.SupportsDirectStream = true; //OpenedMediaSource.SupportsDirectStream = true;

2
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
View file

@ -107,7 +107,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
//OpenedMediaSource.Path = tempFile; //OpenedMediaSource.Path = tempFile;
//OpenedMediaSource.ReadAtNativeFramerate = true; //OpenedMediaSource.ReadAtNativeFramerate = true;
MediaSource.Path = _appHost.GetLocalApiUrl("127.0.0.1") + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts"; MediaSource.Path = _appHost.GetLocalApiUrl("127.0.0.1", true) + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts";
MediaSource.Protocol = MediaProtocol.Http; MediaSource.Protocol = MediaProtocol.Http;
//OpenedMediaSource.Path = TempFilePath; //OpenedMediaSource.Path = TempFilePath;

10
Jellyfin.Server/Program.cs
View file

@ -242,9 +242,15 @@ namespace Jellyfin.Server
.LocalNetworkAddresses .LocalNetworkAddresses
.Select(appHost.NormalizeConfiguredLocalAddress) .Select(appHost.NormalizeConfiguredLocalAddress)
.Where(i => i != null) .Where(i => i != null)
.ToList(); .ToHashSet();
if (addresses.Any()) if (addresses.Any() && !addresses.Contains(IPAddress.Any))
{ {
if (!addresses.Contains(IPAddress.Loopback))
{
// we must listen on loopback for LiveTV to function regardless of the settings
addresses.Add(IPAddress.Loopback);
}
foreach (var address in addresses) foreach (var address in addresses)
{ {
_logger.LogInformation("Kestrel listening on {IpAddress}", address); _logger.LogInformation("Kestrel listening on {IpAddress}", address);

10
MediaBrowser.Controller/IServerApplicationHost.cs
View file

@ -65,22 +65,26 @@ namespace MediaBrowser.Controller
/// <summary> /// <summary>
/// Gets the local API URL. /// Gets the local API URL.
/// </summary> /// </summary>
/// <param name="cancellationToken">Token to cancel the request if needed.</param>
/// <param name="forceHttp">Whether to force usage of plain HTTP protocol.</param>
/// <value>The local API URL.</value> /// <value>The local API URL.</value>
Task<string> GetLocalApiUrl(CancellationToken cancellationToken); Task<string> GetLocalApiUrl(CancellationToken cancellationToken, bool forceHttp = false);
/// <summary> /// <summary>
/// Gets the local API URL. /// Gets the local API URL.
/// </summary> /// </summary>
/// <param name="hostname">The hostname.</param> /// <param name="hostname">The hostname.</param>
/// <param name="forceHttp">Whether to force usage of plain HTTP protocol.</param>
/// <returns>The local API URL.</returns> /// <returns>The local API URL.</returns>
string GetLocalApiUrl(ReadOnlySpan<char> hostname); string GetLocalApiUrl(ReadOnlySpan<char> hostname, bool forceHttp = false);
/// <summary> /// <summary>
/// Gets the local API URL. /// Gets the local API URL.
/// </summary> /// </summary>
/// <param name="address">The IP address.</param> /// <param name="address">The IP address.</param>
/// <param name="forceHttp">Whether to force usage of plain HTTP protocol.</param>
/// <returns>The local API URL.</returns> /// <returns>The local API URL.</returns>
string GetLocalApiUrl(IPAddress address); string GetLocalApiUrl(IPAddress address, bool forceHttp = false);
void LaunchUrl(string url); void LaunchUrl(string url);