Skip to content

changed the merge from using mkvmerge to using ffmpeg #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elisha464 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

changed the merge from using mkvmerge to using ffmpeg #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions src/video/merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,14 @@ import subtitle from '../subtitle/index';
export default function(config: IConfig, isSubtitled: boolean, rtmpInputPath: string, filePath: string,
streamMode: string, verbose: boolean, done: (err: Error) => void)
{
const subtitlePath = filePath + '.' + (subtitle.formats[config.format] ? config.format : 'ass');
let videoPath = filePath;
let cp;
const subtitleFormat = (subtitle.formats[config.format] ? config.format : 'ass');
const subtitlePath = filePath + '.' + subtitleFormat;
const videoPath = filePath + (streamMode === 'RTMP' ? path.extname(rtmpInputPath) : '.mp4');

if (streamMode === 'RTMP')
{
videoPath += path.extname(rtmpInputPath);
}
else
{
videoPath += '.mp4';
}
const cmd = `${command()} -y -i "${videoPath}" ${(isSubtitled ? `-i "${subtitlePath}"` : '')} ` +
`-c copy -c:s ${subtitleFormat} -disposition:s:0 default "${filePath}.mkv"`;

cp = childProcess.exec(command() + ' ' +
'-o "' + filePath + '.mkv" ' +
'"' + videoPath + '" ' +
(isSubtitled ? '"' + subtitlePath + '"' : ''), {
const cp = childProcess.exec(cmd, {
maxBuffer: Infinity,
}, (err) =>
{
Expand All @@ -48,9 +39,8 @@ export default function(config: IConfig, isSubtitled: boolean, rtmpInputPath: st
});
});

if (verbose === true)
if (verbose)
{
cp.stdin.pipe(process.stdin);
cp.stdout.pipe(process.stdout);
cp.stderr.pipe(process.stderr);
}
Expand All @@ -63,10 +53,10 @@ function command(): string
{
if (os.platform() !== 'win32')
{
return 'mkvmerge';
return 'ffmpeg';
}

return '"' + path.join(__dirname, '../../bin/mkvmerge.exe') + '"';
return '"' + path.join(__dirname, '../../bin/ffmpeg.exe') + '"';
}

/**
Expand Down Expand Up @@ -101,4 +91,4 @@ function unlinkTimeout(videoPath: string, subtitlePath: string, timeout: number)
}
});
}, timeout);
}
}