mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-01-05 15:39:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixing pixel format issue

Browse Source
This commit is contained in:
John Andrews
2024-01-29 01:53:00 +13:00
parent dde4a85fe7
commit aff28905df
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs
View File

@@ -196,8 +196,10 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode
string pxtFormat = video?.Stream?.PixelFormat;
if (targetIs10Bit && video?.Stream?.Is10Bit == true)
pxtFormat = "p010le";
if (targetIs10Bit == false && video?.Stream?.Is10Bit == false && video?.Stream?.Is12Bit == false)
else if (targetIs10Bit == false && video?.Stream?.Is10Bit == false && video?.Stream?.Is12Bit == false)
pxtFormat = "yuv420p";
else if (targetIs10Bit)
pxtFormat = string.Empty; // clear it, if we use a 8bit pixel format this will break the colours
startArgs.AddRange(GetHardwareDecodingArgs(args, localFile, FFMPEG, video?.Stream?.Codec, pxtFormat));
}

28
VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs
View File

@@ -1,6 +1,7 @@
using System.Globalization;
using System.Net;
using System.Runtime.InteropServices;
using System.Text;
using FileFlows.VideoNodes.FfmpegBuilderNodes.Models;
namespace FileFlows.VideoNodes.FfmpegBuilderNodes;
@@ -171,27 +172,42 @@ public partial class FfmpegBuilderVideoEncode:FfmpegBuilderNode
args.Variables?.TryGetValue("HW_OFF", out object oHwOff) == true && (oHwOff as bool? == true || oHwOff?.ToString() == "1")
) ? ENCODER_CPU : this.Encoder;
args.Logger?.ILog("Codec: " + Codec);
if (Codec == CODEC_H264)
{
stream.EncodingParameters.AddRange(H264(args, false, Quality, encoder, Speed));
var encodingParameters = H264(args, false, Quality, encoder, Speed).ToArray();
args.Logger?.ILog("Encoding Parameters: " +
string.Join(" ", encodingParameters.Select(x => x.Contains(" ") ? "\"" + x + "\"" : x)));
stream.EncodingParameters.AddRange(encodingParameters);
stream.Codec = CODEC_H264;
}
else if (Codec is CODEC_H265 or CODEC_H265_10BIT)
{
bool tenBit = Codec == CODEC_H265_10BIT || stream.Stream.Is10Bit;
stream.EncodingParameters.AddRange(H265(stream, args, tenBit, Quality, encoder,
stream.Stream.FramesPerSecond, Speed));
args.Logger?.ILog("10 Bit: " + tenBit);
var encodingParameters = H265(stream, args, tenBit, Quality, encoder,
stream.Stream.FramesPerSecond, Speed).ToArray();
args.Logger?.ILog("Encoding Parameters: " +
string.Join(" ", encodingParameters.Select(x => x.Contains(" ") ? "\"" + x + "\"" : x)));
stream.EncodingParameters.AddRange(encodingParameters);
stream.Codec = "hevc";
}
else if (Codec is CODEC_AV1 or CODEC_AV1_10BIT)
{
bool tenBit = Codec == CODEC_AV1_10BIT || stream.Stream.Is10Bit;
stream.EncodingParameters.AddRange(AV1(args, tenBit, Quality, encoder, Speed));
args.Logger?.ILog("10 Bit: " + tenBit);
var encodingParameters = AV1(args, tenBit, Quality, encoder, Speed).ToArray();
args.Logger?.ILog("Encoding Parameters: " +
string.Join(" ", encodingParameters.Select(x => x.Contains(" ") ? "\"" + x + "\"" : x)));
stream.EncodingParameters.AddRange(encodingParameters);
stream.Codec = "av1";
}
else if (Codec == CODEC_VP9)
{
stream.EncodingParameters.AddRange(VP9(args, Quality, encoder, Speed));
var encodingParameters = VP9(args, Quality, encoder, Speed).ToArray();
args.Logger?.ILog("Encoding Parameters: " +
string.Join(" ", encodingParameters.Select(x => x.Contains(" ") ? "\"" + x + "\"" : x)));
stream.EncodingParameters.AddRange(encodingParameters);
stream.Codec = "vp9";
}
else
@@ -322,6 +338,8 @@ public partial class FfmpegBuilderVideoEncode:FfmpegBuilderNode
}
else if(non10BitFilters?.Any() == true)
parameters.AddRange(non10BitFilters);
else if (string.IsNullOrWhiteSpace(stream?.Stream?.PixelFormat) == false)
parameters.AddRange(new[] { "-pix_fmt:v:{index}", stream.Stream.PixelFormat });
return parameters;
}

4
VideoNodes/VideoInfoHelper.cs
View File

@@ -460,8 +460,8 @@ public class VideoInfoHelper
// only p010le confirmed working so far
if(Regex.IsMatch(line, @"p(0)?10l(b)?e"))
return "p010le";
// if(line.IndexOf("yuv420p", StringComparison.Ordinal) > 0)
// return "yuv420p";
if(line.IndexOf("yuv420p", StringComparison.Ordinal) > 0)
return "yuv420p";
// if (line.IndexOf("nv12", StringComparison.Ordinal) >= 0)
// return "nv12";
// if (line.IndexOf("yuv444p", StringComparison.Ordinal) >= 0)