commit
e96b9cb05c
|
@ -710,7 +710,34 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
throw new InvalidOperationException("SeriesId for program not found");
|
throw new InvalidOperationException("SeriesId for program not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If any timers have already been manually created, make sure they don't get cancelled
|
||||||
|
var existingTimers = (await GetTimersAsync(CancellationToken.None).ConfigureAwait(false))
|
||||||
|
.Where(i =>
|
||||||
|
{
|
||||||
|
if (string.Equals(i.ProgramId, info.ProgramId, StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(info.ProgramId))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
//if (string.Equals(i.SeriesId, info.SeriesId, StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(info.SeriesId))
|
||||||
|
//{
|
||||||
|
// return true;
|
||||||
|
//}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
})
|
||||||
|
.ToList();
|
||||||
|
|
||||||
_seriesTimerProvider.Add(info);
|
_seriesTimerProvider.Add(info);
|
||||||
|
|
||||||
|
foreach (var timer in existingTimers)
|
||||||
|
{
|
||||||
|
timer.SeriesTimerId = info.Id;
|
||||||
|
timer.IsManual = true;
|
||||||
|
|
||||||
|
_timerProvider.AddOrUpdate(timer);
|
||||||
|
}
|
||||||
|
|
||||||
await UpdateTimersForSeriesTimer(epgData, info, true, false).ConfigureAwait(false);
|
await UpdateTimersForSeriesTimer(epgData, info, true, false).ConfigureAwait(false);
|
||||||
|
|
||||||
return info.Id;
|
return info.Id;
|
||||||
|
|
|
@ -289,8 +289,10 @@ namespace MediaBrowser.Api.Playback
|
||||||
// MUST read both stdout and stderr asynchronously or a deadlock may occurr
|
// MUST read both stdout and stderr asynchronously or a deadlock may occurr
|
||||||
//process.BeginOutputReadLine();
|
//process.BeginOutputReadLine();
|
||||||
|
|
||||||
|
state.TranscodingJob = transcodingJob;
|
||||||
|
|
||||||
// Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
|
// Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
|
||||||
var task = Task.Run(() => StartStreamingLog(transcodingJob, state, process.StandardError.BaseStream, state.LogFileStream));
|
new JobLogger(Logger).StartStreamingLog(state, process.StandardError.BaseStream, state.LogFileStream);
|
||||||
|
|
||||||
// Wait for the file to exist before proceeeding
|
// Wait for the file to exist before proceeeding
|
||||||
while (!FileSystem.FileExists(state.WaitForPath ?? outputPath) && !transcodingJob.HasExited)
|
while (!FileSystem.FileExists(state.WaitForPath ?? outputPath) && !transcodingJob.HasExited)
|
||||||
|
@ -340,134 +342,6 @@ namespace MediaBrowser.Api.Playback
|
||||||
// string.Equals(GetVideoEncoder(state), "libx264", StringComparison.OrdinalIgnoreCase);
|
// string.Equals(GetVideoEncoder(state), "libx264", StringComparison.OrdinalIgnoreCase);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task StartStreamingLog(TranscodingJob transcodingJob, StreamState state, Stream source, Stream target)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using (var reader = new StreamReader(source))
|
|
||||||
{
|
|
||||||
while (!reader.EndOfStream)
|
|
||||||
{
|
|
||||||
var line = await reader.ReadLineAsync().ConfigureAwait(false);
|
|
||||||
|
|
||||||
ParseLogLine(line, transcodingJob, state);
|
|
||||||
|
|
||||||
var bytes = Encoding.UTF8.GetBytes(Environment.NewLine + line);
|
|
||||||
|
|
||||||
await target.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
|
|
||||||
await target.FlushAsync().ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (ObjectDisposedException)
|
|
||||||
{
|
|
||||||
// Don't spam the log. This doesn't seem to throw in windows, but sometimes under linux
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Logger.ErrorException("Error reading ffmpeg log", ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ParseLogLine(string line, TranscodingJob transcodingJob, StreamState state)
|
|
||||||
{
|
|
||||||
float? framerate = null;
|
|
||||||
double? percent = null;
|
|
||||||
TimeSpan? transcodingPosition = null;
|
|
||||||
long? bytesTranscoded = null;
|
|
||||||
int? bitRate = null;
|
|
||||||
|
|
||||||
var parts = line.Split(' ');
|
|
||||||
|
|
||||||
var totalMs = state.RunTimeTicks.HasValue
|
|
||||||
? TimeSpan.FromTicks(state.RunTimeTicks.Value).TotalMilliseconds
|
|
||||||
: 0;
|
|
||||||
|
|
||||||
var startMs = state.Request.StartTimeTicks.HasValue
|
|
||||||
? TimeSpan.FromTicks(state.Request.StartTimeTicks.Value).TotalMilliseconds
|
|
||||||
: 0;
|
|
||||||
|
|
||||||
for (var i = 0; i < parts.Length; i++)
|
|
||||||
{
|
|
||||||
var part = parts[i];
|
|
||||||
|
|
||||||
if (string.Equals(part, "fps=", StringComparison.OrdinalIgnoreCase) &&
|
|
||||||
(i + 1 < parts.Length))
|
|
||||||
{
|
|
||||||
var rate = parts[i + 1];
|
|
||||||
float val;
|
|
||||||
|
|
||||||
if (float.TryParse(rate, NumberStyles.Any, UsCulture, out val))
|
|
||||||
{
|
|
||||||
framerate = val;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (state.RunTimeTicks.HasValue &&
|
|
||||||
part.StartsWith("time=", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
var time = part.Split(new[] { '=' }, 2).Last();
|
|
||||||
TimeSpan val;
|
|
||||||
|
|
||||||
if (TimeSpan.TryParse(time, UsCulture, out val))
|
|
||||||
{
|
|
||||||
var currentMs = startMs + val.TotalMilliseconds;
|
|
||||||
|
|
||||||
var percentVal = currentMs / totalMs;
|
|
||||||
percent = 100 * percentVal;
|
|
||||||
|
|
||||||
transcodingPosition = val;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (part.StartsWith("size=", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
var size = part.Split(new[] { '=' }, 2).Last();
|
|
||||||
|
|
||||||
int? scale = null;
|
|
||||||
if (size.IndexOf("kb", StringComparison.OrdinalIgnoreCase) != -1)
|
|
||||||
{
|
|
||||||
scale = 1024;
|
|
||||||
size = size.Replace("kb", string.Empty, StringComparison.OrdinalIgnoreCase);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (scale.HasValue)
|
|
||||||
{
|
|
||||||
long val;
|
|
||||||
|
|
||||||
if (long.TryParse(size, NumberStyles.Any, UsCulture, out val))
|
|
||||||
{
|
|
||||||
bytesTranscoded = val * scale.Value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (part.StartsWith("bitrate=", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
var rate = part.Split(new[] { '=' }, 2).Last();
|
|
||||||
|
|
||||||
int? scale = null;
|
|
||||||
if (rate.IndexOf("kbits/s", StringComparison.OrdinalIgnoreCase) != -1)
|
|
||||||
{
|
|
||||||
scale = 1024;
|
|
||||||
rate = rate.Replace("kbits/s", string.Empty, StringComparison.OrdinalIgnoreCase);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (scale.HasValue)
|
|
||||||
{
|
|
||||||
float val;
|
|
||||||
|
|
||||||
if (float.TryParse(rate, NumberStyles.Any, UsCulture, out val))
|
|
||||||
{
|
|
||||||
bitRate = (int)Math.Ceiling(val * scale.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (framerate.HasValue || percent.HasValue)
|
|
||||||
{
|
|
||||||
ApiEntryPoint.Instance.ReportTranscodingProgress(transcodingJob, state, transcodingPosition, framerate, percent, bytesTranscoded, bitRate);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Processes the exited.
|
/// Processes the exited.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -268,7 +268,7 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
"hls/" + Path.GetFileNameWithoutExtension(outputPath));
|
"hls/" + Path.GetFileNameWithoutExtension(outputPath));
|
||||||
}
|
}
|
||||||
|
|
||||||
var useGenericSegmenter = false;
|
var useGenericSegmenter = true;
|
||||||
if (useGenericSegmenter)
|
if (useGenericSegmenter)
|
||||||
{
|
{
|
||||||
var outputTsArg = Path.Combine(Path.GetDirectoryName(outputPath), Path.GetFileNameWithoutExtension(outputPath)) + "%d" + GetSegmentFileExtension(state.Request);
|
var outputTsArg = Path.Combine(Path.GetDirectoryName(outputPath), Path.GetFileNameWithoutExtension(outputPath)) + "%d" + GetSegmentFileExtension(state.Request);
|
||||||
|
@ -281,7 +281,9 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
segmentFormat = "mpegts";
|
segmentFormat = "mpegts";
|
||||||
}
|
}
|
||||||
|
|
||||||
return string.Format("{0} {1} -map_metadata -1 -map_chapters -1 -threads {2} {3} {4} {5} -f segment -max_delay 5000000 -avoid_negative_ts disabled -start_at_zero -segment_time {6} {10} -individual_header_trailer 0 -segment_format {11} -segment_list_type m3u8 -segment_start_number {7} -segment_list \"{8}\" -y \"{9}\"",
|
baseUrlParam = string.Format("\"{0}/\"", "hls/" + Path.GetFileNameWithoutExtension(outputPath));
|
||||||
|
|
||||||
|
return string.Format("{0} {1} -map_metadata -1 -map_chapters -1 -threads {2} {3} {4} {5} -f segment -max_delay 5000000 -avoid_negative_ts disabled -start_at_zero -segment_time {6} {10} -individual_header_trailer 0 -segment_format {11} -segment_list_entry_prefix {12} -segment_list_type m3u8 -segment_start_number {7} -segment_list \"{8}\" -y \"{9}\"",
|
||||||
inputModifier,
|
inputModifier,
|
||||||
EncodingHelper.GetInputArgument(state, encodingOptions),
|
EncodingHelper.GetInputArgument(state, encodingOptions),
|
||||||
threads,
|
threads,
|
||||||
|
@ -293,7 +295,8 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
outputPath,
|
outputPath,
|
||||||
outputTsArg,
|
outputTsArg,
|
||||||
timeDeltaParam,
|
timeDeltaParam,
|
||||||
segmentFormat
|
segmentFormat,
|
||||||
|
baseUrlParam
|
||||||
).Trim();
|
).Trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -154,6 +154,8 @@ namespace MediaBrowser.Api.Playback
|
||||||
DisposeLiveStream();
|
DisposeLiveStream();
|
||||||
DisposeLogStream();
|
DisposeLogStream();
|
||||||
DisposeIsoMount();
|
DisposeIsoMount();
|
||||||
|
|
||||||
|
TranscodingJob = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DisposeLogStream()
|
private void DisposeLogStream()
|
||||||
|
@ -476,5 +478,11 @@ namespace MediaBrowser.Api.Playback
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public TranscodingJob TranscodingJob;
|
||||||
|
public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate)
|
||||||
|
{
|
||||||
|
ApiEntryPoint.Instance.ReportTranscodingProgress(TranscodingJob, this, transcodingPosition, framerate, percentComplete, bytesTranscoded, bitRate);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -190,6 +190,7 @@
|
||||||
<Compile Include="MediaEncoding\ImageEncodingOptions.cs" />
|
<Compile Include="MediaEncoding\ImageEncodingOptions.cs" />
|
||||||
<Compile Include="MediaEncoding\IMediaEncoder.cs" />
|
<Compile Include="MediaEncoding\IMediaEncoder.cs" />
|
||||||
<Compile Include="MediaEncoding\ISubtitleEncoder.cs" />
|
<Compile Include="MediaEncoding\ISubtitleEncoder.cs" />
|
||||||
|
<Compile Include="MediaEncoding\JobLogger.cs" />
|
||||||
<Compile Include="MediaEncoding\MediaInfoRequest.cs" />
|
<Compile Include="MediaEncoding\MediaInfoRequest.cs" />
|
||||||
<Compile Include="MediaEncoding\MediaStreamSelector.cs" />
|
<Compile Include="MediaEncoding\MediaStreamSelector.cs" />
|
||||||
<Compile Include="Net\AuthenticatedAttribute.cs" />
|
<Compile Include="Net\AuthenticatedAttribute.cs" />
|
||||||
|
|
|
@ -12,7 +12,7 @@ using MediaBrowser.Model.MediaInfo;
|
||||||
namespace MediaBrowser.Controller.MediaEncoding
|
namespace MediaBrowser.Controller.MediaEncoding
|
||||||
{
|
{
|
||||||
// For now, a common base class until the API and MediaEncoding classes are unified
|
// For now, a common base class until the API and MediaEncoding classes are unified
|
||||||
public class EncodingJobInfo
|
public abstract class EncodingJobInfo
|
||||||
{
|
{
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
|
|
||||||
|
@ -115,5 +115,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
IsoMount = null;
|
IsoMount = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public abstract void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
namespace MediaBrowser.MediaEncoding.Encoder
|
namespace MediaBrowser.Controller.MediaEncoding
|
||||||
{
|
{
|
||||||
public class JobLogger
|
public class JobLogger
|
||||||
{
|
{
|
||||||
|
@ -18,7 +18,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async void StartStreamingLog(EncodingJob transcodingJob, Stream source, Stream target)
|
public async void StartStreamingLog(EncodingJobInfo state, Stream source, Stream target)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -28,35 +28,41 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
{
|
{
|
||||||
var line = await reader.ReadLineAsync().ConfigureAwait(false);
|
var line = await reader.ReadLineAsync().ConfigureAwait(false);
|
||||||
|
|
||||||
ParseLogLine(line, transcodingJob);
|
ParseLogLine(line, state);
|
||||||
|
|
||||||
var bytes = Encoding.UTF8.GetBytes(Environment.NewLine + line);
|
var bytes = Encoding.UTF8.GetBytes(Environment.NewLine + line);
|
||||||
|
|
||||||
await target.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
|
await target.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
|
||||||
|
await target.FlushAsync().ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (ObjectDisposedException)
|
||||||
|
{
|
||||||
|
// Don't spam the log. This doesn't seem to throw in windows, but sometimes under linux
|
||||||
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.ErrorException("Error reading ffmpeg log", ex);
|
_logger.ErrorException("Error reading ffmpeg log", ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ParseLogLine(string line, EncodingJob transcodingJob)
|
private void ParseLogLine(string line, EncodingJobInfo state)
|
||||||
{
|
{
|
||||||
float? framerate = null;
|
float? framerate = null;
|
||||||
double? percent = null;
|
double? percent = null;
|
||||||
TimeSpan? transcodingPosition = null;
|
TimeSpan? transcodingPosition = null;
|
||||||
long? bytesTranscoded = null;
|
long? bytesTranscoded = null;
|
||||||
|
int? bitRate = null;
|
||||||
|
|
||||||
var parts = line.Split(' ');
|
var parts = line.Split(' ');
|
||||||
|
|
||||||
var totalMs = transcodingJob.RunTimeTicks.HasValue
|
var totalMs = state.RunTimeTicks.HasValue
|
||||||
? TimeSpan.FromTicks(transcodingJob.RunTimeTicks.Value).TotalMilliseconds
|
? TimeSpan.FromTicks(state.RunTimeTicks.Value).TotalMilliseconds
|
||||||
: 0;
|
: 0;
|
||||||
|
|
||||||
var startMs = transcodingJob.Options.StartTimeTicks.HasValue
|
var startMs = state.BaseRequest.StartTimeTicks.HasValue
|
||||||
? TimeSpan.FromTicks(transcodingJob.Options.StartTimeTicks.Value).TotalMilliseconds
|
? TimeSpan.FromTicks(state.BaseRequest.StartTimeTicks.Value).TotalMilliseconds
|
||||||
: 0;
|
: 0;
|
||||||
|
|
||||||
for (var i = 0; i < parts.Length; i++)
|
for (var i = 0; i < parts.Length; i++)
|
||||||
|
@ -74,7 +80,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
framerate = val;
|
framerate = val;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (transcodingJob.RunTimeTicks.HasValue &&
|
else if (state.RunTimeTicks.HasValue &&
|
||||||
part.StartsWith("time=", StringComparison.OrdinalIgnoreCase))
|
part.StartsWith("time=", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
var time = part.Split(new[] { '=' }, 2).Last();
|
var time = part.Split(new[] { '=' }, 2).Last();
|
||||||
|
@ -111,11 +117,32 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (part.StartsWith("bitrate=", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
var rate = part.Split(new[] { '=' }, 2).Last();
|
||||||
|
|
||||||
|
int? scale = null;
|
||||||
|
if (rate.IndexOf("kbits/s", StringComparison.OrdinalIgnoreCase) != -1)
|
||||||
|
{
|
||||||
|
scale = 1024;
|
||||||
|
rate = rate.Replace("kbits/s", string.Empty, StringComparison.OrdinalIgnoreCase);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (scale.HasValue)
|
||||||
|
{
|
||||||
|
float val;
|
||||||
|
|
||||||
|
if (float.TryParse(rate, NumberStyles.Any, _usCulture, out val))
|
||||||
|
{
|
||||||
|
bitRate = (int)Math.Ceiling(val * scale.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (framerate.HasValue || percent.HasValue)
|
if (framerate.HasValue || percent.HasValue)
|
||||||
{
|
{
|
||||||
transcodingJob.ReportTranscodingProgress(transcodingPosition, framerate, percent, bytesTranscoded);
|
state.ReportTranscodingProgress(transcodingPosition, framerate, percent, bytesTranscoded, bitRate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -242,7 +242,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
|
|
||||||
private void OnTranscodeBeginning(EncodingJob job)
|
private void OnTranscodeBeginning(EncodingJob job)
|
||||||
{
|
{
|
||||||
job.ReportTranscodingProgress(null, null, null, null);
|
job.ReportTranscodingProgress(null, null, null, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnTranscodeFailedToStart(string path, EncodingJob job)
|
private void OnTranscodeFailedToStart(string path, EncodingJob job)
|
||||||
|
|
|
@ -377,7 +377,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded)
|
public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate)
|
||||||
{
|
{
|
||||||
var ticks = transcodingPosition.HasValue ? transcodingPosition.Value.Ticks : (long?)null;
|
var ticks = transcodingPosition.HasValue ? transcodingPosition.Value.Ticks : (long?)null;
|
||||||
|
|
||||||
|
@ -385,8 +385,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
|
|
||||||
if (!percentComplete.HasValue && ticks.HasValue && RunTimeTicks.HasValue)
|
if (!percentComplete.HasValue && ticks.HasValue && RunTimeTicks.HasValue)
|
||||||
{
|
{
|
||||||
var pct = ticks.Value/RunTimeTicks.Value;
|
var pct = ticks.Value / RunTimeTicks.Value;
|
||||||
percentComplete = pct*100;
|
percentComplete = pct * 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (percentComplete.HasValue)
|
if (percentComplete.HasValue)
|
||||||
|
|
|
@ -55,7 +55,6 @@
|
||||||
<Compile Include="Encoder\EncodingUtils.cs" />
|
<Compile Include="Encoder\EncodingUtils.cs" />
|
||||||
<Compile Include="Encoder\EncoderValidator.cs" />
|
<Compile Include="Encoder\EncoderValidator.cs" />
|
||||||
<Compile Include="Encoder\FontConfigLoader.cs" />
|
<Compile Include="Encoder\FontConfigLoader.cs" />
|
||||||
<Compile Include="Encoder\JobLogger.cs" />
|
|
||||||
<Compile Include="Encoder\MediaEncoder.cs" />
|
<Compile Include="Encoder\MediaEncoder.cs" />
|
||||||
<Compile Include="Encoder\VideoEncoder.cs" />
|
<Compile Include="Encoder\VideoEncoder.cs" />
|
||||||
<Compile Include="Probing\FFProbeHelpers.cs" />
|
<Compile Include="Probing\FFProbeHelpers.cs" />
|
||||||
|
|
|
@ -324,7 +324,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
if (directPlayProfile != null)
|
if (directPlayProfile != null)
|
||||||
{
|
{
|
||||||
// While options takes the network and other factors into account. Only applies to direct stream
|
// While options takes the network and other factors into account. Only applies to direct stream
|
||||||
if (item.SupportsDirectStream && IsAudioEligibleForDirectPlay(item, options.GetMaxBitrate(true)) && options.EnableDirectStream)
|
if (item.SupportsDirectStream && IsAudioEligibleForDirectPlay(item, options.GetMaxBitrate(true), PlayMethod.DirectStream) && options.EnableDirectStream)
|
||||||
{
|
{
|
||||||
playMethods.Add(PlayMethod.DirectStream);
|
playMethods.Add(PlayMethod.DirectStream);
|
||||||
}
|
}
|
||||||
|
@ -332,7 +332,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
// The profile describes what the device supports
|
// The profile describes what the device supports
|
||||||
// If device requirements are satisfied then allow both direct stream and direct play
|
// If device requirements are satisfied then allow both direct stream and direct play
|
||||||
if (item.SupportsDirectPlay &&
|
if (item.SupportsDirectPlay &&
|
||||||
IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options, true)) && options.EnableDirectPlay)
|
IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options, true), PlayMethod.DirectPlay) && options.EnableDirectPlay)
|
||||||
{
|
{
|
||||||
playMethods.Add(PlayMethod.DirectPlay);
|
playMethods.Add(PlayMethod.DirectPlay);
|
||||||
}
|
}
|
||||||
|
@ -905,7 +905,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return IsAudioEligibleForDirectPlay(item, maxBitrate);
|
return IsAudioEligibleForDirectPlay(item, maxBitrate, playMethod);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod, string transcodingSubProtocol, string transcodingContainer)
|
public static SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod, string transcodingSubProtocol, string transcodingContainer)
|
||||||
|
@ -1035,7 +1035,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, long? maxBitrate)
|
private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, long? maxBitrate, PlayMethod playMethod)
|
||||||
{
|
{
|
||||||
// Don't restrict by bitrate if coming from an external domain
|
// Don't restrict by bitrate if coming from an external domain
|
||||||
if (item.IsRemote)
|
if (item.IsRemote)
|
||||||
|
@ -1045,19 +1045,19 @@ namespace MediaBrowser.Model.Dlna
|
||||||
|
|
||||||
if (!maxBitrate.HasValue)
|
if (!maxBitrate.HasValue)
|
||||||
{
|
{
|
||||||
_logger.Info("Cannot direct play due to unknown supported bitrate");
|
_logger.Info("Cannot "+ playMethod + " due to unknown supported bitrate");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!item.Bitrate.HasValue)
|
if (!item.Bitrate.HasValue)
|
||||||
{
|
{
|
||||||
_logger.Info("Cannot direct play due to unknown content bitrate");
|
_logger.Info("Cannot " + playMethod + " due to unknown content bitrate");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.Bitrate.Value > maxBitrate.Value)
|
if (item.Bitrate.Value > maxBitrate.Value)
|
||||||
{
|
{
|
||||||
_logger.Info("Bitrate exceeds DirectPlay limit: media bitrate: {0}, max bitrate: {1}", item.Bitrate.Value.ToString(CultureInfo.InvariantCulture), maxBitrate.Value.ToString(CultureInfo.InvariantCulture));
|
_logger.Info("Bitrate exceeds " + playMethod + " limit: media bitrate: {0}, max bitrate: {1}", item.Bitrate.Value.ToString(CultureInfo.InvariantCulture), maxBitrate.Value.ToString(CultureInfo.InvariantCulture));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -172,18 +172,11 @@ namespace MediaBrowser.Providers.Manager
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var currentFile = _fileSystem.GetFileInfo(currentPath);
|
_fileSystem.DeleteFile(currentPath);
|
||||||
|
|
||||||
// This will fail if the file is hidden
|
|
||||||
if (currentFile.Exists)
|
|
||||||
{
|
|
||||||
if (currentFile.IsHidden)
|
|
||||||
{
|
|
||||||
_fileSystem.SetHidden(currentFile.FullName, false);
|
|
||||||
}
|
}
|
||||||
|
catch (FileNotFoundException)
|
||||||
|
{
|
||||||
|
|
||||||
_fileSystem.DeleteFile(currentFile.FullName);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|
|
@ -373,20 +373,15 @@ namespace MediaBrowser.Providers.Manager
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete the source file
|
try
|
||||||
var currentFile = _fileSystem.GetFileInfo(image.Path);
|
|
||||||
|
|
||||||
// Deletion will fail if the file is hidden so remove the attribute first
|
|
||||||
if (currentFile.Exists)
|
|
||||||
{
|
{
|
||||||
if (currentFile.IsHidden)
|
_fileSystem.DeleteFile(image.Path);
|
||||||
{
|
|
||||||
_fileSystem.SetHidden(currentFile.FullName, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
_fileSystem.DeleteFile(currentFile.FullName);
|
|
||||||
deleted = true;
|
deleted = true;
|
||||||
}
|
}
|
||||||
|
catch (FileNotFoundException)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var image in deletedImages)
|
foreach (var image in deletedImages)
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.8.10")]
|
[assembly: AssemblyVersion("3.2.8.11")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user