16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Add check for convert. Never used.

This commit is contained in:
sixteenmillimeter 2020-01-20 01:15:20 -05:00
parent 35b8b0def2
commit 691e741d70
10 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/ffmpeg/index.js
View File

@ -14,6 +14,7 @@ class FFMPEG {
constructor(sys) {
this.id = 'ffmpeg';
this.bin = sys.deps.ffmpeg;
this.convert = sys.deps.convert;
this.TMPDIR = path_1.join(sys.tmp, 'mcopy_digital');
this.init();
}
@ -75,7 +76,7 @@ class FFMPEG {
});
//
cmd = `${this.bin} -y -i "${video}" -vf "select='gte(n\\,${frameNum})'${scale}" -vframes 1 -compression_algo raw -pix_fmt rgb24 "${tmpoutput}"`;
cmd2 = `convert "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
cmd2 = `${this.convert} "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
//ffmpeg -i "${video}" -ss 00:00:07.000 -vframes 1 "export-${time}.jpg"
//ffmpeg -i "${video}" -compression_algo raw -pix_fmt rgb24 "export-%05d.tiff"
//-vf "select=gte(n\,${frame})" -compression_algo raw -pix_fmt rgb24 "export-${padded}.png"
@ -88,7 +89,7 @@ class FFMPEG {
}
if (output && output.stdout)
this.log.info(`"${output.stdout}"`);
if (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255) {
if (this.convert && (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255)) {
try {
this.log.info(cmd2);
output2 = await exec_1.exec(cmd2);

2
app/lib/ffmpeg/index.js.map
View File

File diff suppressed because one or more lines are too long

2
app/lib/ui/filmout.js
View File

@ -158,6 +158,7 @@ class FilmOut {
displayName = pathStr.split('/').pop();
elem.val(displayName);
$('#filmout_file').val(displayName);
this.useFile();
}
});
}
@ -185,6 +186,7 @@ class FilmOut {
$('#projector_type_digital').prop('checked', 'checked');
$('#digital').removeClass('active');
}
//cancel video
}
onFilmout(evt, args) {
let state;

2
app/lib/ui/filmout.js.map
View File

File diff suppressed because one or more lines are too long

2
app/lib/ui/index.js
View File

@ -52,7 +52,7 @@ gui.notify = function (title, message) {
}
return resolve(true);
});
})
});
};
gui.updateCam = async function (t) {
'use strict';

3
app/src/lib/ui/filmout.ts
View File

@ -162,6 +162,8 @@ class FilmOut {
displayName = pathStr.split('/').pop();
elem.val(displayName);
$('#filmout_file').val(displayName);
this.useFile();
}
}
useFile () {
@ -188,6 +190,7 @@ class FilmOut {
$('#projector_type_digital').prop('checked', 'checked');
$('#digital').removeClass('active');
}
//cancel video
}
onFilmout (evt : any, args : any) {
let state : any;

5
cli/lib/ffmpeg/index.js
View File

@ -14,6 +14,7 @@ class FFMPEG {
constructor(sys) {
this.id = 'ffmpeg';
this.bin = sys.deps.ffmpeg;
this.convert = sys.deps.convert;
this.TMPDIR = path_1.join(sys.tmp, 'mcopy_digital');
this.init();
}
@ -75,7 +76,7 @@ class FFMPEG {
});
//
cmd = `${this.bin} -y -i "${video}" -vf "select='gte(n\\,${frameNum})'${scale}" -vframes 1 -compression_algo raw -pix_fmt rgb24 "${tmpoutput}"`;
cmd2 = `convert "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
cmd2 = `${this.convert} "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
//ffmpeg -i "${video}" -ss 00:00:07.000 -vframes 1 "export-${time}.jpg"
//ffmpeg -i "${video}" -compression_algo raw -pix_fmt rgb24 "export-%05d.tiff"
//-vf "select=gte(n\,${frame})" -compression_algo raw -pix_fmt rgb24 "export-${padded}.png"
@ -88,7 +89,7 @@ class FFMPEG {
}
if (output && output.stdout)
this.log.info(`"${output.stdout}"`);
if (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255) {
if (this.convert && (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255)) {
try {
this.log.info(cmd2);
output2 = await exec_1.exec(cmd2);

2
cli/lib/ffmpeg/index.js.map
View File

File diff suppressed because one or more lines are too long

6
src/ffmpeg/index.ts
View File

@ -13,6 +13,7 @@ import { exit } from 'exit';
class FFMPEG {
private bin : string;
private convert : string;
private log : any;
private id : string = 'ffmpeg';
private TMPDIR : string;
@ -25,6 +26,7 @@ class FFMPEG {
**/
constructor (sys : any) {
this.bin = sys.deps.ffmpeg;
this.convert = sys.deps.convert;
this.TMPDIR = join(sys.tmp, 'mcopy_digital');
this.init();
}
@ -93,7 +95,7 @@ class FFMPEG {
});
//
cmd = `${this.bin} -y -i "${video}" -vf "select='gte(n\\,${frameNum})'${scale}" -vframes 1 -compression_algo raw -pix_fmt rgb24 "${tmpoutput}"`;
cmd2 = `convert "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
cmd2 = `${this.convert} "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
//ffmpeg -i "${video}" -ss 00:00:07.000 -vframes 1 "export-${time}.jpg"
//ffmpeg -i "${video}" -compression_algo raw -pix_fmt rgb24 "export-%05d.tiff"
@ -107,7 +109,7 @@ class FFMPEG {
}
if (output && output.stdout) this.log.info(`"${output.stdout}"`);
if (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255) {
if (this.convert && (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255)) {
try {
this.log.info(cmd2);
output2 = await exec(cmd2);

1
src/filmout/index.ts
View File

@ -202,6 +202,7 @@ class FilmOut {
this.state.enabled = true;
return await this.ui.send(this.id, { valid : true, state : JSON.stringify(this.state) });
}
/**
* Return true if gif is animated, false if it is a still
*