Former-commit-id: 476c8f33c0
This commit is contained in:
Malte Rosenbjerg 2023-01-29 23:01:26 +01:00
parent f7a325b2e3
commit 766bec2112
4 changed files with 9 additions and 7 deletions

View file

@ -3,11 +3,13 @@
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.Numerics; using System.Numerics;
using System.Runtime.Versioning;
using FFMpegCore.Extensions.System.Drawing.Common; using FFMpegCore.Extensions.System.Drawing.Common;
using FFMpegCore.Pipes; using FFMpegCore.Pipes;
namespace FFMpegCore.Test namespace FFMpegCore.Test.Utilities
{ {
[SupportedOSPlatform("windows")]
static class BitmapSource static class BitmapSource
{ {
public static IEnumerable<IVideoFrame> CreateBitmaps(int count, PixelFormat fmt, int w, int h) public static IEnumerable<IVideoFrame> CreateBitmaps(int count, PixelFormat fmt, int w, int h)

View file

@ -4,10 +4,10 @@ public class AudibleEncryptionKeyArgument : IArgument
{ {
private readonly bool _aaxcMode; private readonly bool _aaxcMode;
private readonly string _key; private readonly string? _key;
private readonly string _iv; private readonly string? _iv;
private readonly string _activationBytes; private readonly string? _activationBytes;
public AudibleEncryptionKeyArgument(string activationBytes) public AudibleEncryptionKeyArgument(string activationBytes)

View file

@ -12,7 +12,7 @@ public class FFProbeAnalysis
public Format Format { get; set; } = null!; public Format Format { get; set; } = null!;
[JsonIgnore] [JsonIgnore]
public IReadOnlyList<string> ErrorData { get; set; } public IReadOnlyList<string> ErrorData { get; set; } = new List<string>();
} }
public class FFProbeStream : ITagsContainer, IDispositionContainer public class FFProbeStream : ITagsContainer, IDispositionContainer
@ -108,7 +108,7 @@ public class Format : ITagsContainer
public string Size { get; set; } = null!; public string Size { get; set; } = null!;
[JsonPropertyName("bit_rate")] [JsonPropertyName("bit_rate")]
public string BitRate { get; set; } = null!; public string? BitRate { get; set; } = null!;
[JsonPropertyName("probe_score")] [JsonPropertyName("probe_score")]
public int ProbeScore { get; set; } public int ProbeScore { get; set; }

View file

@ -13,7 +13,7 @@ internal MediaAnalysis(FFProbeAnalysis analysis)
VideoStreams = analysis.Streams.Where(stream => stream.CodecType == "video").Select(ParseVideoStream).ToList(); VideoStreams = analysis.Streams.Where(stream => stream.CodecType == "video").Select(ParseVideoStream).ToList();
AudioStreams = analysis.Streams.Where(stream => stream.CodecType == "audio").Select(ParseAudioStream).ToList(); AudioStreams = analysis.Streams.Where(stream => stream.CodecType == "audio").Select(ParseAudioStream).ToList();
SubtitleStreams = analysis.Streams.Where(stream => stream.CodecType == "subtitle").Select(ParseSubtitleStream).ToList(); SubtitleStreams = analysis.Streams.Where(stream => stream.CodecType == "subtitle").Select(ParseSubtitleStream).ToList();
ErrorData = analysis.ErrorData ?? new List<string>().AsReadOnly(); ErrorData = analysis.ErrorData;
} }
private MediaFormat ParseFormat(Format analysisFormat) private MediaFormat ParseFormat(Format analysisFormat)