Merge pull request #450 from HaveAGitGat/2.10.01

Fix bug checking streams
This commit is contained in:
HaveAGitGat 2023-08-31 07:10:07 +01:00 committed by GitHub
commit 114a36aaf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 24 deletions

View file

@ -27,16 +27,22 @@ var details = function () { return ({
exports.details = details; exports.details = details;
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
var plugin = function (args) { var plugin = function (args) {
var _a, _b;
var lib = require('../../../../../methods/lib')(); var lib = require('../../../../../methods/lib')();
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details); args.inputs = lib.loadDefaultValues(args.inputs, details);
var is10Bit = false; var is10Bit = false;
for (var i = 0; i < args.variables.ffmpegCommand.streams.length; i += 1) { if (Array.isArray((_b = (_a = args === null || args === void 0 ? void 0 : args.inputFileObj) === null || _a === void 0 ? void 0 : _a.ffProbeData) === null || _b === void 0 ? void 0 : _b.streams)) {
var stream = args.variables.ffmpegCommand.streams[i]; for (var i = 0; i < args.inputFileObj.ffProbeData.streams.length; i += 1) {
var stream = args.inputFileObj.ffProbeData.streams[i];
if (stream.codec_type === 'video' && stream.bits_per_raw_sample === 10) { if (stream.codec_type === 'video' && stream.bits_per_raw_sample === 10) {
is10Bit = true; is10Bit = true;
} }
} }
}
else {
throw new Error('File has not stream data');
}
return { return {
outputFileObj: args.inputFileObj, outputFileObj: args.inputFileObj,
outputNumber: is10Bit ? 1 : 2, outputNumber: is10Bit ? 1 : 2,

View file

@ -27,12 +27,14 @@ var details = function () { return ({
exports.details = details; exports.details = details;
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
var plugin = function (args) { var plugin = function (args) {
var _a, _b;
var lib = require('../../../../../methods/lib')(); var lib = require('../../../../../methods/lib')();
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details); args.inputs = lib.loadDefaultValues(args.inputs, details);
var isHdr = false; var isHdr = false;
for (var i = 0; i < args.variables.ffmpegCommand.streams.length; i += 1) { if (Array.isArray((_b = (_a = args === null || args === void 0 ? void 0 : args.inputFileObj) === null || _a === void 0 ? void 0 : _a.ffProbeData) === null || _b === void 0 ? void 0 : _b.streams)) {
var stream = args.variables.ffmpegCommand.streams[i]; for (var i = 0; i < args.inputFileObj.ffProbeData.streams.length; i += 1) {
var stream = args.inputFileObj.ffProbeData.streams[i];
if (stream.codec_type === 'video' if (stream.codec_type === 'video'
&& stream.transfer_characteristics === 'smpte2084' && stream.transfer_characteristics === 'smpte2084'
&& stream.color_primaries === 'bt2020' && stream.color_primaries === 'bt2020'
@ -40,6 +42,10 @@ var plugin = function (args) {
isHdr = true; isHdr = true;
} }
} }
}
else {
throw new Error('File has not stream data');
}
return { return {
outputFileObj: args.inputFileObj, outputFileObj: args.inputFileObj,
outputNumber: isHdr ? 1 : 2, outputNumber: isHdr ? 1 : 2,

View file

@ -36,12 +36,16 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
let is10Bit = false; let is10Bit = false;
for (let i = 0; i < args.variables.ffmpegCommand.streams.length; i += 1) { if (Array.isArray(args?.inputFileObj?.ffProbeData?.streams)) {
const stream = args.variables.ffmpegCommand.streams[i]; for (let i = 0; i < args.inputFileObj.ffProbeData.streams.length; i += 1) {
const stream = args.inputFileObj.ffProbeData.streams[i];
if (stream.codec_type === 'video' && stream.bits_per_raw_sample === 10) { if (stream.codec_type === 'video' && stream.bits_per_raw_sample === 10) {
is10Bit = true; is10Bit = true;
} }
} }
} else {
throw new Error('File has not stream data');
}
return { return {
outputFileObj: args.inputFileObj, outputFileObj: args.inputFileObj,

View file

@ -36,8 +36,9 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
let isHdr = false; let isHdr = false;
for (let i = 0; i < args.variables.ffmpegCommand.streams.length; i += 1) { if (Array.isArray(args?.inputFileObj?.ffProbeData?.streams)) {
const stream = args.variables.ffmpegCommand.streams[i]; for (let i = 0; i < args.inputFileObj.ffProbeData.streams.length; i += 1) {
const stream = args.inputFileObj.ffProbeData.streams[i];
if ( if (
stream.codec_type === 'video' stream.codec_type === 'video'
&& stream.transfer_characteristics === 'smpte2084' && stream.transfer_characteristics === 'smpte2084'
@ -47,6 +48,9 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
isHdr = true; isHdr = true;
} }
} }
} else {
throw new Error('File has not stream data');
}
return { return {
outputFileObj: args.inputFileObj, outputFileObj: args.inputFileObj,