From cb9dfe3f0064a95a3bf95cb591371e07c164ba94 Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Fri, 25 Oct 2019 12:12:35 -0400 Subject: [PATCH] Add alternate executable flag. Add "negative" flag for inverting colors. --- package-lock.json | 77 +++++++++++++++++------------------------------ package.json | 2 +- src/v2f.ts | 14 ++++++--- v2f.js | 14 ++++++--- 4 files changed, 48 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0804b47..48db5fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "v2f", - "version": "1.2.0", + "version": "1.2.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1437,9 +1437,9 @@ "dev": true }, "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.5.tgz", + "integrity": "sha512-0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -1830,9 +1830,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.camelcase": { "version": "4.3.0", @@ -1982,9 +1982,9 @@ "dev": true }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -2061,9 +2061,9 @@ } }, "neo-async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz", - "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", "dev": true }, "nexe": { @@ -2610,9 +2610,9 @@ } }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -3088,20 +3088,20 @@ "dev": true }, "uglify-js": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.4.tgz", - "integrity": "sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==", + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.4.tgz", + "integrity": "sha512-9Yc2i881pF4BPGhjteCXQNaXx1DCwm3dtOyBaG2hitHjLWOczw/ki8vD1bqyT3u6K0Ms/FpCShkmfg+FtlOfYA==", "dev": true, "optional": true, "requires": { - "commander": "~2.20.0", + "commander": "~2.20.3", "source-map": "~0.6.1" }, "dependencies": { "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true, "optional": true } @@ -3141,38 +3141,15 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unset-value": { diff --git a/package.json b/package.json index 6291713..0a1dcf5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "v2f", - "version": "1.2.0", + "version": "1.2.1", "description": "Turn a video into strips of precise 16mm-size stills", "main": "v2f.js", "scripts": { diff --git a/src/v2f.ts b/src/v2f.ts index 0b9d7c4..21c0598 100644 --- a/src/v2f.ts +++ b/src/v2f.ts @@ -9,6 +9,7 @@ const os = require('os') const osTmp : string = os.tmpdir() const TMP : string = path.join(osTmp, '/v2f/') +const pkg : any = require('package.json') class Dimensions{ h : number; @@ -67,12 +68,14 @@ function initialize (command : any) { const dim : any = new Dimensions(film, dpi) const pageW : number = command.width || 8.5 const pageL : number = command.length || 11 + const exe : string = command.executable || 'avconv' + const negative : boolean = typeof command.negative !== 'undefined' ? true : false if (!fs.existsSync(input)) error(`Video "${input}" cannot be found`) async.series([ (next : any)=> { - convert(input, dim, next) + convert(exe, input, dim, negative, next) }, (next : any) => { stitch(output, dim, next, pageW, pageL) @@ -92,9 +95,10 @@ function initialize (command : any) { * @param {Integer} length strip length in frames * */ -function convert (input : string, dim : any, next : any) { +function convert (exe : string, input : string, dim : any, negative : boolean = false, next : any) { const file : string = input.split('/').pop() - const execStr : string = `avconv -i "${input}" -s ${dim.w}x${dim.h} -qscale 1 "${TMP}v2f_sequence_%04d.jpg"` + const negStr : string = negative ? `-vf lutrgb="r=negval:g=negval:b=negval"` : ''; + const execStr : string = `${exe} -i "${input}" -s ${dim.w}x${dim.h} -qscale 1 ${negStr} "${TMP}v2f_sequence_%04d.jpg"` console.log(`Converting ${file}...`) console.log(`Exporting all frames with aspect ratio: ${dim.w / dim.h}...`) @@ -212,14 +216,16 @@ if (args[1].indexOf('v2f.js') === -1) { } cmd.arguments(' ') - .version('1.1.0') + .version(pkg.version) .option('-i, --input ', 'Video source to print to film strip, anything that avconv can read') .option('-o, --output ', 'Output directory, will render images on specified page size') .option('-d, --dpi ', 'DPI output pages') .option('-f, --film ', 'Choose film gauge: 16mm, super16, 35mm') .option('-w, --width ', 'Output page width, in inches. Default 8.5') .option('-l, --length ', 'Output page length, in inches. Default 11') + .option('-e, --executable ', 'Alternate binary to use in place of avconv') .option('-v, --verbose', 'Run in verbose mode') + .option('-n, --negative', 'Invert color channels to create negative') .parse(args) initialize(cmd) \ No newline at end of file diff --git a/v2f.js b/v2f.js index fa58663..233ea12 100644 --- a/v2f.js +++ b/v2f.js @@ -7,6 +7,7 @@ const path = require('path'); const os = require('os'); const osTmp = os.tmpdir(); const TMP = path.join(osTmp, '/v2f/'); +const pkg = require('package.json'); class Dimensions { constructor(filmStr, dpi) { const IN = dpi / 25.4; @@ -58,11 +59,13 @@ function initialize(command) { const dim = new Dimensions(film, dpi); const pageW = command.width || 8.5; const pageL = command.length || 11; + const exe = command.executable || 'avconv'; + const negative = typeof command.negative !== 'undefined' ? true : false; if (!fs.existsSync(input)) error(`Video "${input}" cannot be found`); async.series([ (next) => { - convert(input, dim, next); + convert(exe, input, dim, negative, next); }, (next) => { stitch(output, dim, next, pageW, pageL); @@ -81,9 +84,10 @@ function initialize(command) { * @param {Integer} length strip length in frames * */ -function convert(input, dim, next) { +function convert(exe, input, dim, negative = false, next) { const file = input.split('/').pop(); - const execStr = `avconv -i "${input}" -s ${dim.w}x${dim.h} -qscale 1 "${TMP}v2f_sequence_%04d.jpg"`; + const negStr = negative ? `-vf lutrgb="r=negval:g=negval:b=negval"` : ''; + const execStr = `${exe} -i "${input}" -s ${dim.w}x${dim.h} -qscale 1 ${negStr} "${TMP}v2f_sequence_%04d.jpg"`; console.log(`Converting ${file}...`); console.log(`Exporting all frames with aspect ratio: ${dim.w / dim.h}...`); if (!fs.existsSync(TMP)) @@ -191,13 +195,15 @@ if (args[1].indexOf('v2f.js') === -1) { args.reverse(); } cmd.arguments(' ') - .version('1.1.0') + .version(pkg.version) .option('-i, --input ', 'Video source to print to film strip, anything that avconv can read') .option('-o, --output ', 'Output directory, will render images on specified page size') .option('-d, --dpi ', 'DPI output pages') .option('-f, --film ', 'Choose film gauge: 16mm, super16, 35mm') .option('-w, --width ', 'Output page width, in inches. Default 8.5') .option('-l, --length ', 'Output page length, in inches. Default 11') + .option('-e, --executable ', 'Alternate binary to use in place of avconv') .option('-v, --verbose', 'Run in verbose mode') + .option('-n, --negative', 'Invert color channels to create negative') .parse(args); initialize(cmd);