mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
commit
0a9a5480c8
5 changed files with 76 additions and 27 deletions
|
@ -1231,7 +1231,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
RequiresOpening = false,
|
RequiresOpening = false,
|
||||||
RequiresClosing = false,
|
RequiresClosing = false,
|
||||||
Protocol = MediaBrowser.Model.MediaInfo.MediaProtocol.Http,
|
Protocol = MediaBrowser.Model.MediaInfo.MediaProtocol.Http,
|
||||||
BufferMs = 0
|
BufferMs = 0,
|
||||||
|
IgnoreDts = true
|
||||||
};
|
};
|
||||||
|
|
||||||
var isAudio = false;
|
var isAudio = false;
|
||||||
|
@ -1516,8 +1517,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
EnforceKeepUpTo(timer, seriesPath);
|
EnforceKeepUpTo(timer, seriesPath);
|
||||||
};
|
};
|
||||||
|
|
||||||
await recorder.Record(mediaStreamInfo, recordPath, duration, onStarted, cancellationToken)
|
await recorder.Record(mediaStreamInfo, recordPath, duration, onStarted, cancellationToken).ConfigureAwait(false);
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
recordingStatus = RecordingStatus.Completed;
|
recordingStatus = RecordingStatus.Completed;
|
||||||
_logger.Info("Recording completed: {0}", recordPath);
|
_logger.Info("Recording completed: {0}", recordPath);
|
||||||
|
|
|
@ -80,13 +80,20 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
|
|
||||||
public string GetOutputPath(MediaSourceInfo mediaSource, string targetFile)
|
public string GetOutputPath(MediaSourceInfo mediaSource, string targetFile)
|
||||||
{
|
{
|
||||||
return Path.ChangeExtension(targetFile, "." + OutputFormat);
|
var extension = OutputFormat;
|
||||||
|
|
||||||
|
if (string.Equals(extension, "mpegts", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
extension = "ts";
|
||||||
|
}
|
||||||
|
|
||||||
|
return Path.ChangeExtension(targetFile, "." + extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task Record(MediaSourceInfo mediaSource, string targetFile, TimeSpan duration, Action onStarted, CancellationToken cancellationToken)
|
public async Task Record(MediaSourceInfo mediaSource, string targetFile, TimeSpan duration, Action onStarted, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var durationToken = new CancellationTokenSource(duration);
|
//var durationToken = new CancellationTokenSource(duration);
|
||||||
cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
|
//cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
|
||||||
|
|
||||||
await RecordFromFile(mediaSource, mediaSource.Path, targetFile, duration, onStarted, cancellationToken).ConfigureAwait(false);
|
await RecordFromFile(mediaSource, mediaSource.Path, targetFile, duration, onStarted, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
@ -171,36 +178,34 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
}
|
}
|
||||||
|
|
||||||
var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks);
|
var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks);
|
||||||
var inputModifiers = "-fflags +genpts -async 1 -vsync -1";
|
|
||||||
|
var flags = new List<string>();
|
||||||
|
if (mediaSource.IgnoreDts)
|
||||||
|
{
|
||||||
|
flags.Add("+igndts");
|
||||||
|
}
|
||||||
|
if (mediaSource.IgnoreIndex)
|
||||||
|
{
|
||||||
|
flags.Add("+ignidx");
|
||||||
|
}
|
||||||
|
|
||||||
|
var inputModifiers = "-async 1 -vsync -1";
|
||||||
|
|
||||||
|
if (flags.Count > 0)
|
||||||
|
{
|
||||||
|
inputModifiers += " -fflags " + string.Join("", flags.ToArray());
|
||||||
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(GetEncodingOptions().HardwareAccelerationType))
|
if (!string.IsNullOrWhiteSpace(GetEncodingOptions().HardwareAccelerationType))
|
||||||
{
|
{
|
||||||
inputModifiers += " -hwaccel auto";
|
inputModifiers += " -hwaccel auto";
|
||||||
}
|
}
|
||||||
|
|
||||||
var commandLineArgs = "-i \"{0}\"{5} {2} -map_metadata -1 -threads 0 {3}{4}{6} -y \"{1}\"";
|
|
||||||
|
|
||||||
long startTimeTicks = 0;
|
|
||||||
//if (mediaSource.DateLiveStreamOpened.HasValue)
|
|
||||||
//{
|
|
||||||
// var elapsed = DateTime.UtcNow - mediaSource.DateLiveStreamOpened.Value;
|
|
||||||
// elapsed -= TimeSpan.FromSeconds(10);
|
|
||||||
// if (elapsed.TotalSeconds >= 0)
|
|
||||||
// {
|
|
||||||
// startTimeTicks = elapsed.Ticks + startTimeTicks;
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
if (mediaSource.ReadAtNativeFramerate)
|
if (mediaSource.ReadAtNativeFramerate)
|
||||||
{
|
{
|
||||||
inputModifiers += " -re";
|
inputModifiers += " -re";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (startTimeTicks > 0)
|
|
||||||
{
|
|
||||||
inputModifiers = "-ss " + _mediaEncoder.GetTimeParameter(startTimeTicks) + " " + inputModifiers;
|
|
||||||
}
|
|
||||||
|
|
||||||
var analyzeDurationSeconds = 5;
|
var analyzeDurationSeconds = 5;
|
||||||
var analyzeDuration = " -analyzeduration " +
|
var analyzeDuration = " -analyzeduration " +
|
||||||
(analyzeDurationSeconds * 1000000).ToString(CultureInfo.InvariantCulture);
|
(analyzeDurationSeconds * 1000000).ToString(CultureInfo.InvariantCulture);
|
||||||
|
@ -212,7 +217,14 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
" -f mp4 -movflags frag_keyframe+empty_moov" :
|
" -f mp4 -movflags frag_keyframe+empty_moov" :
|
||||||
string.Empty;
|
string.Empty;
|
||||||
|
|
||||||
commandLineArgs = string.Format(commandLineArgs, inputTempFile, targetFile, videoArgs, GetAudioArgs(mediaSource), subtitleArgs, durationParam, outputParam);
|
var commandLineArgs = string.Format("-i \"{0}\"{5} {2} -map_metadata -1 -threads 0 {3}{4}{6} -y \"{1}\"",
|
||||||
|
inputTempFile,
|
||||||
|
targetFile,
|
||||||
|
videoArgs,
|
||||||
|
GetAudioArgs(mediaSource),
|
||||||
|
subtitleArgs,
|
||||||
|
durationParam,
|
||||||
|
outputParam);
|
||||||
|
|
||||||
return inputModifiers + " " + commandLineArgs;
|
return inputModifiers + " " + commandLineArgs;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,11 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
|
||||||
|
|
||||||
byte[] buffer = new byte[BufferSize];
|
byte[] buffer = new byte[BufferSize];
|
||||||
|
|
||||||
|
if (source == null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException("source");
|
||||||
|
}
|
||||||
|
|
||||||
while (!cancellationToken.IsCancellationRequested)
|
while (!cancellationToken.IsCancellationRequested)
|
||||||
{
|
{
|
||||||
var bytesRead = await source.ReadAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false);
|
var bytesRead = await source.ReadAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
|
@ -4,6 +4,8 @@ using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using MediaBrowser.Controller.Extensions;
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.Manager
|
namespace MediaBrowser.Providers.Manager
|
||||||
{
|
{
|
||||||
|
@ -122,6 +124,11 @@ namespace MediaBrowser.Providers.Manager
|
||||||
if (replaceData || targetResult.People == null || targetResult.People.Count == 0)
|
if (replaceData || targetResult.People == null || targetResult.People.Count == 0)
|
||||||
{
|
{
|
||||||
targetResult.People = sourceResult.People;
|
targetResult.People = sourceResult.People;
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (targetResult.People != null && sourceResult.People != null)
|
||||||
|
{
|
||||||
|
MergePeople(sourceResult.People, targetResult.People);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,6 +212,31 @@ namespace MediaBrowser.Providers.Manager
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void MergePeople(List<PersonInfo> source, List<PersonInfo> target)
|
||||||
|
{
|
||||||
|
foreach (var person in target)
|
||||||
|
{
|
||||||
|
var normalizedName = person.Name.RemoveDiacritics();
|
||||||
|
var personInSource = source.FirstOrDefault(i => string.Equals(i.Name.RemoveDiacritics(), normalizedName, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
|
if (personInSource != null)
|
||||||
|
{
|
||||||
|
foreach (var providerId in personInSource.ProviderIds)
|
||||||
|
{
|
||||||
|
if (!person.ProviderIds.ContainsKey(providerId.Key))
|
||||||
|
{
|
||||||
|
person.ProviderIds[providerId.Key] = providerId.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(person.ImageUrl))
|
||||||
|
{
|
||||||
|
person.ImageUrl = personInSource.ImageUrl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void MergeMetadataSettings(BaseItem source,
|
public static void MergeMetadataSettings(BaseItem source,
|
||||||
BaseItem target)
|
BaseItem target)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.13.10")]
|
[assembly: AssemblyVersion("3.2.13.11")]
|
||||||
|
|
Loading…
Reference in a new issue