Merge pull request #450 from HaveAGitGat/2.10.01

Fix bug checking streams
make-only-subtitle-default
HaveAGitGat 2 years ago committed by GitHub
commit 114a36aaf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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) {
if (stream.codec_type === 'video' && stream.bits_per_raw_sample === 10) { var stream = args.inputFileObj.ffProbeData.streams[i];
is10Bit = true; if (stream.codec_type === 'video' && stream.bits_per_raw_sample === 10) {
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,

@ -27,19 +27,25 @@ 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) {
if (stream.codec_type === 'video' var stream = args.inputFileObj.ffProbeData.streams[i];
&& stream.transfer_characteristics === 'smpte2084' if (stream.codec_type === 'video'
&& stream.color_primaries === 'bt2020' && stream.transfer_characteristics === 'smpte2084'
&& stream.color_range === 'tv') { && stream.color_primaries === 'bt2020'
isHdr = true; && stream.color_range === 'tv') {
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,

@ -36,11 +36,15 @@ 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) {
if (stream.codec_type === 'video' && stream.bits_per_raw_sample === 10) { const stream = args.inputFileObj.ffProbeData.streams[i];
is10Bit = true; if (stream.codec_type === 'video' && stream.bits_per_raw_sample === 10) {
is10Bit = true;
}
} }
} else {
throw new Error('File has not stream data');
} }
return { return {

@ -36,16 +36,20 @@ 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) {
if ( const stream = args.inputFileObj.ffProbeData.streams[i];
stream.codec_type === 'video' if (
&& stream.transfer_characteristics === 'smpte2084' stream.codec_type === 'video'
&& stream.color_primaries === 'bt2020' && stream.transfer_characteristics === 'smpte2084'
&& stream.color_range === 'tv' && stream.color_primaries === 'bt2020'
) { && stream.color_range === 'tv'
isHdr = true; ) {
isHdr = true;
}
} }
} else {
throw new Error('File has not stream data');
} }
return { return {

Loading…
Cancel
Save