matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Add a way to set ffmpeg options before the -i flag.

Browse Source
This commit is contained in:
Rapptz
2016-03-25 18:49:23 -04:00
parent f1736bc08f
commit 4fa1bcadaa
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
discord/voice_client.py
View File

@@ -343,7 +343,7 @@ class VoiceClient:
struct.pack_into('>I', buff, 8, self.ssrc) struct.pack_into('>I', buff, 8, self.ssrc)
return buff return buff
def create_ffmpeg_player(self, filename, *, use_avconv=False, pipe=False, options=None, headers=None, after=None): def create_ffmpeg_player(self, filename, *, use_avconv=False, pipe=False, options=None, before_options=None, headers=None, after=None):
"""Creates a stream player for ffmpeg that launches in a separate thread to play """Creates a stream player for ffmpeg that launches in a separate thread to play
audio. audio.
@@ -376,8 +376,10 @@ class VoiceClient:
pipe : bool pipe : bool
If true, denotes that ``filename`` parameter will be passed If true, denotes that ``filename`` parameter will be passed
to the stdin of ffmpeg. to the stdin of ffmpeg.
options: str options : str
Extra command line flags to pass to ``ffmpeg``. Extra command line flags to pass to ``ffmpeg`` after the ``-i`` flag.
before_options : str
Command line flags to pass to ``ffmpeg`` before the ``-i`` flag.
headers: dict headers: dict
HTTP headers dictionary to pass to ``-headers`` command line option HTTP headers dictionary to pass to ``-headers`` command line option
after : callable after : callable
@@ -397,13 +399,17 @@ class VoiceClient:
""" """
command = 'ffmpeg' if not use_avconv else 'avconv' command = 'ffmpeg' if not use_avconv else 'avconv'
input_name = '-' if pipe else shlex.quote(filename) input_name = '-' if pipe else shlex.quote(filename)
headers_arg = "" before_args = ""
if isinstance(headers, dict): if isinstance(headers, dict):
for key, value in headers.items(): for key, value in headers.items():
headers_arg += "{}: {}\r\n".format(key, value) before_args += "{}: {}\r\n".format(key, value)
headers_arg = ' -headers ' + shlex.quote(headers_arg) before_args = ' -headers ' + shlex.quote(before_args)
if isinstance(before_options, str):
before_args += ' ' + before_options
cmd = command + '{} -i {} -f s16le -ar {} -ac {} -loglevel warning' cmd = command + '{} -i {} -f s16le -ar {} -ac {} -loglevel warning'
cmd = cmd.format(headers_arg, input_name, self.encoder.sampling_rate, self.encoder.channels) cmd = cmd.format(before_args, input_name, self.encoder.sampling_rate, self.encoder.channels)
if isinstance(options, str): if isinstance(options, str):
cmd = cmd + ' ' + options cmd = cmd + ' ' + options