Browse Source

fix handling of rotated videos

pull/22/head
Mikael Finstad 6 years ago
parent
commit
6ff5e02547
  1. 8
      index.js

8
index.js

@ -124,7 +124,7 @@ module.exports = async (config = {}) => {
if (type === 'video') {
const { cutFrom: cutFromIn, cutTo: cutToIn, path } = layer;
const fileInfo = await readFileInfo(path);
const { duration: fileDuration, width, height, framerateStr } = fileInfo;
const { duration: fileDuration, width: widthIn, height: heightIn, framerateStr, rotation } = fileInfo;
let cutFrom;
let cutTo;
let trimmedSourceDuration = fileDuration;
@ -146,6 +146,10 @@ module.exports = async (config = {}) => {
framePtsFactor = 1;
}
const isRotated = rotation === 90 || rotation === 270;
const width = isRotated ? heightIn : widthIn;
const height = isRotated ? widthIn : heightIn;
return { ...layer, cutFrom, cutTo, width, height, framerateStr, framePtsFactor };
}
@ -193,9 +197,9 @@ module.exports = async (config = {}) => {
height = isGif ? calculatedHeight : multipleOf2(calculatedHeight); // x264 requires multiple of 2
width = desiredWidth;
} else {
// Cannot detect width/height from video, set defaults
width = desiredWidth;
height = desiredWidth;
// console.log(`Cannot detect width/height from video, set defaults ${width}x${height}`);
}
// User override?

Loading…
Cancel
Save