Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-11 09:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Potential FFMPEG process fix (#381)

Browse Source 
I am by no means sure that this will work. This is an experimental fix.
Please review it carefully; I’m not the best at working with
audio/streams.
This commit is contained in:
Programmix
2016-05-27 23:09:16 -07:00
committed by abalabahaha
parent e912c72a95
commit 2194632b7d
4 changed files with 118 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/Voice/AudioEncoder.js
View File

@@ -73,34 +73,7 @@ export default class AudioEncoder {
stream.pipe(enc.stdin);
var ffmpegErrors = "";
enc.stdout.pipe(this.volume);
enc.stderr.on("data", (data) => {
ffmpegErrors += "\n" + new Buffer(data).toString().trim();
});
enc.once("exit", (code, signal) => {
if (code) {
reject(new Error("FFMPEG: " + ffmpegErrors));
}
})
this.volume.once("readable", () => {
resolve({
proc: enc,
stream: this.volume,
instream: stream,
channels: 2
});
});
this.volume.on("end", () => {
reject("end");
});
this.volume.on("close", () => {
reject("close");
});
hookEncodingProcess(resolve, reject, enc, stream);
});
}
@@ -117,33 +90,7 @@ export default class AudioEncoder {
'pipe:1'
]);
var ffmpegErrors = "";
enc.stdout.pipe(this.volume);
enc.stderr.on("data", (data) => {
ffmpegErrors += "\n" + new Buffer(data).toString().trim();
});
enc.once("exit", (code, signal) => {
if (code) {
reject(new Error("FFMPEG: " + ffmpegErrors));
}
})
this.volume.once("readable", () => {
resolve({
proc: enc,
stream: this.volume,
channels: 2
});
});
this.volume.on("end", () => {
reject("end");
});
this.volume.on("close", () => {
reject("close");
});
hookEncodingProcess(resolve, reject, enc);
});
}
@@ -160,33 +107,59 @@ export default class AudioEncoder {
]);
var enc = cpoc.spawn(this.getCommand(), options);
var ffmpegErrors = "";
hookEncodingProcess(resolve, reject, enc);
});
}
enc.stdout.pipe(this.volume);
enc.stderr.on("data", (data) => {
ffmpegErrors += "\n" + new Buffer(data).toString().trim();
});
enc.once("exit", (code, signal) => {
if (code) {
reject(new Error("FFMPEG: " + ffmpegErrors));
}
})
hookEncodingProcess(resolve, reject, enc, stream) {
var processKilled = false;
this.volume.once("readable", () => {
resolve({
proc: enc,
stream: this.volume,
channels: 2
});
});
function killProcess() {
if (processKilled)
return;
this.volume.on("end", () => {
reject("end");
});
enc.stdin.pause();
enc.kill("SIGINT");
this.volume.on("close", () => {
reject("close");
});
processKilled = true;
}
var ffmpegErrors = "";
enc.stdout.pipe(this.volume);
enc.stderr.on("data", (data) => {
ffmpegErrors += "\n" + new Buffer(data).toString().trim();
});
enc.once("exit", (code, signal) => {
if (code) {
reject(new Error("FFMPEG: " + ffmpegErrors));
}
});
this.volume.once("readable", () => {
var data = {
proc: enc,
stream: this.volume,
channels: 2
};
if (stream) {
data.instream = stream;
}
resolve(data);
});
this.volume.on("end", () => {
killProcess();
reject("end");
});
this.volume.on("close", () => {
killProcess();
reject("close");
});
}
}