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

Fixed ffmpeg/avconv confusions

Browse Source
This commit is contained in:
hydrabolt
2015-11-08 16:40:40 +00:00
parent 36e40d1b35
commit ad536445d9
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Voice/AudioEncoder.js
View File

@@ -49,6 +49,7 @@ var AudioEncoder = (function () {
var p = cpoc.spawnSync(choice); var p = cpoc.spawnSync(choice);
if (!p.error) { if (!p.error) {
console.log("found " + choice);
this.choice = choice; this.choice = choice;
return choice; return choice;
} }
@@ -97,7 +98,7 @@ var AudioEncoder = (function () {
var self = this; var self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
var enc = cpoc.spawn("ffmpeg", ["-f", "s16le", "-ar", "48000", "-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth. var enc = cpoc.spawn(self.getChoice(), ["-f", "s16le", "-ar", "48000", "-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.
"-af", "volume=1", "pipe:1", "-i", file]); "-af", "volume=1", "pipe:1", "-i", file]);
enc.stdout.once("readable", function () { enc.stdout.once("readable", function () {

3
src/Voice/AudioEncoder.js
View File

@@ -34,6 +34,7 @@ class AudioEncoder{
for(var choice of choices){ for(var choice of choices){
var p = cpoc.spawnSync(choice); var p = cpoc.spawnSync(choice);
if(!p.error){ if(!p.error){
console.log("found " + choice);
this.choice = choice; this.choice = choice;
return choice; return choice;
} }
@@ -84,7 +85,7 @@ class AudioEncoder{
encodeFile(file, callback=function(err, buffer){}){ encodeFile(file, callback=function(err, buffer){}){
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
var enc = cpoc.spawn("ffmpeg" , [ var enc = cpoc.spawn(self.getChoice() , [
"-f", "s16le", "-f", "s16le",
"-ar", "48000", "-ar", "48000",
"-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth. "-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.

4
test/bot.1.js
View File

@@ -39,8 +39,8 @@ client.on("message", m => {
if (client.internal.voiceConnection) { if (client.internal.voiceConnection) {
var connection = client.internal.voiceConnection; var connection = client.internal.voiceConnection;
var request = require("request");
connection.playFile(rest).then(intent => { connection.playRawStream(request(rest)).then(intent => {
client.reply(m, "playing!").then((msg) => { client.reply(m, "playing!").then((msg) => {
intent.on("end", () => { intent.on("end", () => {