mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-09 15:20:34 +02:00
assume interlaced for external plugins
This commit is contained in:
parent
aba4933a5c
commit
4941aa4d14
|
@ -1163,7 +1163,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
};
|
};
|
||||||
|
|
||||||
var isAudio = false;
|
var isAudio = false;
|
||||||
await new LiveStreamHelper(_mediaEncoder, _logger).AddMediaInfoWithProbe(stream, isAudio, cancellationToken).ConfigureAwait(false);
|
await new LiveStreamHelper(_mediaEncoder, _logger).AddMediaInfoWithProbe(stream, isAudio, false, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
return new List<MediaSourceInfo>
|
return new List<MediaSourceInfo>
|
||||||
{
|
{
|
||||||
|
|
|
@ -6,6 +6,7 @@ using System.Threading.Tasks;
|
||||||
using MediaBrowser.Controller.MediaEncoding;
|
using MediaBrowser.Controller.MediaEncoding;
|
||||||
using MediaBrowser.Model.Dlna;
|
using MediaBrowser.Model.Dlna;
|
||||||
using MediaBrowser.Model.Dto;
|
using MediaBrowser.Model.Dto;
|
||||||
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Logging;
|
using MediaBrowser.Model.Logging;
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.LiveTv
|
namespace Emby.Server.Implementations.LiveTv
|
||||||
|
@ -21,7 +22,7 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task AddMediaInfoWithProbe(MediaSourceInfo mediaSource, bool isAudio, CancellationToken cancellationToken)
|
public async Task AddMediaInfoWithProbe(MediaSourceInfo mediaSource, bool isAudio, bool assumeInterlaced, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var originalRuntime = mediaSource.RunTimeTicks;
|
var originalRuntime = mediaSource.RunTimeTicks;
|
||||||
|
|
||||||
|
@ -95,6 +96,17 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
videoStream.IsAVC = null;
|
videoStream.IsAVC = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (assumeInterlaced)
|
||||||
|
{
|
||||||
|
foreach (var mediaStream in mediaSource.MediaStreams)
|
||||||
|
{
|
||||||
|
if (mediaStream.Type == MediaStreamType.Video)
|
||||||
|
{
|
||||||
|
mediaStream.IsInterlaced = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Try to estimate this
|
// Try to estimate this
|
||||||
mediaSource.InferTotalBitrate(true);
|
mediaSource.InferTotalBitrate(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -246,9 +246,9 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
return info.Item1;
|
return info.Item1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<Tuple<MediaSourceInfo, IDirectStreamProvider>> GetChannelStream(string id, string mediaSourceId, CancellationToken cancellationToken)
|
public Task<Tuple<MediaSourceInfo, IDirectStreamProvider, bool>> GetChannelStream(string id, string mediaSourceId, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
return await GetLiveStream(id, mediaSourceId, true, cancellationToken).ConfigureAwait(false);
|
return GetLiveStream(id, mediaSourceId, true, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
private string GetItemExternalId(BaseItem item)
|
private string GetItemExternalId(BaseItem item)
|
||||||
|
@ -308,7 +308,7 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
return _services.FirstOrDefault(i => string.Equals(i.Name, name, StringComparison.OrdinalIgnoreCase));
|
return _services.FirstOrDefault(i => string.Equals(i.Name, name, StringComparison.OrdinalIgnoreCase));
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<Tuple<MediaSourceInfo, IDirectStreamProvider>> GetLiveStream(string id, string mediaSourceId, bool isChannel, CancellationToken cancellationToken)
|
private async Task<Tuple<MediaSourceInfo, IDirectStreamProvider, bool>> GetLiveStream(string id, string mediaSourceId, bool isChannel, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
if (string.Equals(id, mediaSourceId, StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(id, mediaSourceId, StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
|
@ -319,6 +319,7 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
bool isVideo;
|
bool isVideo;
|
||||||
ILiveTvService service;
|
ILiveTvService service;
|
||||||
IDirectStreamProvider directStreamProvider = null;
|
IDirectStreamProvider directStreamProvider = null;
|
||||||
|
var assumeInterlaced = false;
|
||||||
|
|
||||||
if (isChannel)
|
if (isChannel)
|
||||||
{
|
{
|
||||||
|
@ -367,7 +368,12 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
|
|
||||||
Normalize(info, service, isVideo);
|
Normalize(info, service, isVideo);
|
||||||
|
|
||||||
return new Tuple<MediaSourceInfo, IDirectStreamProvider>(info, directStreamProvider);
|
if (!(service is EmbyTV.EmbyTV))
|
||||||
|
{
|
||||||
|
assumeInterlaced = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Tuple<MediaSourceInfo, IDirectStreamProvider, bool>(info, directStreamProvider, assumeInterlaced);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Normalize(MediaSourceInfo mediaSource, ILiveTvService service, bool isVideo)
|
private void Normalize(MediaSourceInfo mediaSource, ILiveTvService service, bool isVideo)
|
||||||
|
|
|
@ -126,12 +126,14 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
var keys = openToken.Split(new[] { StreamIdDelimeter }, 3);
|
var keys = openToken.Split(new[] { StreamIdDelimeter }, 3);
|
||||||
var mediaSourceId = keys.Length >= 3 ? keys[2] : null;
|
var mediaSourceId = keys.Length >= 3 ? keys[2] : null;
|
||||||
IDirectStreamProvider directStreamProvider = null;
|
IDirectStreamProvider directStreamProvider = null;
|
||||||
|
var assumeInterlaced = false;
|
||||||
|
|
||||||
if (string.Equals(keys[0], typeof(LiveTvChannel).Name, StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(keys[0], typeof(LiveTvChannel).Name, StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
var info = await _liveTvManager.GetChannelStream(keys[1], mediaSourceId, cancellationToken).ConfigureAwait(false);
|
var info = await _liveTvManager.GetChannelStream(keys[1], mediaSourceId, cancellationToken).ConfigureAwait(false);
|
||||||
stream = info.Item1;
|
stream = info.Item1;
|
||||||
directStreamProvider = info.Item2;
|
directStreamProvider = info.Item2;
|
||||||
|
assumeInterlaced = info.Item3;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -146,7 +148,7 @@ namespace Emby.Server.Implementations.LiveTv
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
await new LiveStreamHelper(_mediaEncoder, _logger).AddMediaInfoWithProbe(stream, isAudio, cancellationToken).ConfigureAwait(false);
|
await new LiveStreamHelper(_mediaEncoder, _logger).AddMediaInfoWithProbe(stream, isAudio, assumeInterlaced, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|
|
@ -157,7 +157,7 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
/// <param name="mediaSourceId">The media source identifier.</param>
|
/// <param name="mediaSourceId">The media source identifier.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>Task{StreamResponseInfo}.</returns>
|
/// <returns>Task{StreamResponseInfo}.</returns>
|
||||||
Task<Tuple<MediaSourceInfo, IDirectStreamProvider>> GetChannelStream(string id, string mediaSourceId, CancellationToken cancellationToken);
|
Task<Tuple<MediaSourceInfo, IDirectStreamProvider, bool>> GetChannelStream(string id, string mediaSourceId, CancellationToken cancellationToken);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the program.
|
/// Gets the program.
|
||||||
|
|
Loading…
Reference in a new issue