virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

the media node now won't connect itself to the default audio input with -ad wait:

Browse Source 
(allows redirecting another node to it)

Originally committed as revision 1713 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
François Revol 2003-03-27 15:08:16 +00:00
parent 788a2d3d8b
commit 335338e884
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/beosaudio.cpp
View File

@ -181,7 +181,7 @@ static void audiorecord_callback(void *cookie, bigtime_t timestamp, void *buffer
}
#endif
static int audio_open(AudioData *s, int is_output)
static int audio_open(AudioData *s, int is_output, const char *audio_device)
{
int p[2];
int ret;
@ -210,7 +210,13 @@ static int audio_open(AudioData *s, int is_output)
set_thread_priority(find_thread(NULL), B_DISPLAY_PRIORITY+1);
#ifdef HAVE_BSOUNDRECORDER
if (!is_output) {
s->recorder = new BSoundRecorder(&iformat, false, "ffmpeg input", audiorecord_callback);
bool wait_for_input = false;
if (audio_device && !strcmp(audio_device, "wait:"))
wait_for_input = true;
s->recorder = new BSoundRecorder(&iformat, wait_for_input, "ffmpeg input", audiorecord_callback);
if (wait_for_input && (s->recorder->InitCheck() == B_OK)) {
s->recorder->WaitForIncomingConnection(&iformat);
}
if (s->recorder->InitCheck() != B_OK || iformat.format != media_raw_audio_format::B_AUDIO_SHORT) {
delete s->recorder;
s->recorder = NULL;
@ -283,7 +289,7 @@ static int audio_write_header(AVFormatContext *s1)
st = s1->streams[0];
s->sample_rate = st->codec.sample_rate;
s->channels = st->codec.channels;
ret = audio_open(s, 1);
ret = audio_open(s, 1, NULL);
if (ret < 0)
return -EIO;
return 0;
@ -345,7 +351,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
s->sample_rate = ap->sample_rate;
s->channels = ap->channels;
ret = audio_open(s, 0);
ret = audio_open(s, 0, ap->device);
if (ret < 0) {
av_free(st);
return -EIO;