Merge pull request #6042 from crobibero/mbc-warn-2

This commit is contained in:
Bond-009
2021-05-18 21:21:26 +02:00
committed by GitHub
53 changed files with 417 additions and 435 deletions

View File

@@ -2933,6 +2933,7 @@ namespace MediaBrowser.Controller.MediaEncoding
return threads;
}
#nullable disable
public void TryStreamCopy(EncodingJobInfo state)
{

View File

@@ -430,7 +430,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
/// <summary>
/// Predicts the audio sample rate that will be in the output stream.
/// Gets the target video level.
/// </summary>
public double? TargetVideoLevel
{
@@ -453,7 +453,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
/// <summary>
/// Predicts the audio sample rate that will be in the output stream.
/// Gets the target video bit depth.
/// </summary>
public int? TargetVideoBitDepth
{
@@ -488,7 +488,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
/// <summary>
/// Predicts the audio sample rate that will be in the output stream.
/// Gets the target framerate.
/// </summary>
public float? TargetFramerate
{
@@ -520,7 +520,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
/// <summary>
/// Predicts the audio sample rate that will be in the output stream.
/// Gets the target packet length.
/// </summary>
public int? TargetPacketLength
{
@@ -536,7 +536,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
/// <summary>
/// Predicts the audio sample rate that will be in the output stream.
/// Gets the target video profile.
/// </summary>
public string TargetVideoProfile
{
@@ -700,25 +700,4 @@ namespace MediaBrowser.Controller.MediaEncoding
Progress.Report(percentComplete.Value);
}
}
/// <summary>
/// Enum TranscodingJobType.
/// </summary>
public enum TranscodingJobType
{
/// <summary>
/// The progressive.
/// </summary>
Progressive,
/// <summary>
/// The HLS.
/// </summary>
Hls,
/// <summary>
/// The dash.
/// </summary>
Dash
}
}

View File

@@ -20,7 +20,7 @@ namespace MediaBrowser.Controller.MediaEncoding
public interface IMediaEncoder : ITranscoderSupport
{
/// <summary>
/// The location of the discovered FFmpeg tool.
/// Gets location of the discovered FFmpeg tool.
/// </summary>
FFmpegLocation EncoderLocation { get; }

View File

@@ -0,0 +1,23 @@
namespace MediaBrowser.Controller.MediaEncoding
{
/// <summary>
/// Enum TranscodingJobType.
/// </summary>
public enum TranscodingJobType
{
/// <summary>
/// The progressive.
/// </summary>
Progressive,
/// <summary>
/// The HLS.
/// </summary>
Hls,
/// <summary>
/// The dash.
/// </summary>
Dash
}
}