comparison beosaudio.cpp @ 97:265d01c2248f libavformat

the media node now won't connect itself to the default audio input with -ad wait: (allows redirecting another node to it)

96:2d3083edb99f

        bufferSize -= len;
    }
}
#endif

static int audio_open(AudioData *s, int is_output)
{
    int p[2];
    int ret;
    media_raw_audio_format format;
    media_multi_audio_format iformat;

    s->frame_size = AUDIO_BLOCK_SIZE;
    /* bump up the priority (avoid realtime though) */
    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);
        if (s->recorder->InitCheck() != B_OK || iformat.format != media_raw_audio_format::B_AUDIO_SHORT) {
            delete s->recorder;
            s->recorder = NULL;
            if (s->input_sem)
                delete_sem(s->input_sem);

    int ret;

    st = s1->streams[0];
    s->sample_rate = st->codec.sample_rate;
    s->channels = st->codec.channels;
    ret = audio_open(s, 1);
    if (ret < 0)
        return -EIO;
    return 0;
}

        return -ENOMEM;
    }
    s->sample_rate = ap->sample_rate;
    s->channels = ap->channels;

    ret = audio_open(s, 0);
    if (ret < 0) {
        av_free(st);
        return -EIO;
    }
    /* take real parameters */

97:265d01c2248f

        bufferSize -= len;
    }
}
#endif

static int audio_open(AudioData *s, int is_output, const char *audio_device)
{
    int p[2];
    int ret;
    media_raw_audio_format format;
    media_multi_audio_format iformat;

    s->frame_size = AUDIO_BLOCK_SIZE;
    /* bump up the priority (avoid realtime though) */
    set_thread_priority(find_thread(NULL), B_DISPLAY_PRIORITY+1);
#ifdef HAVE_BSOUNDRECORDER
    if (!is_output) {
        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;
            if (s->input_sem)
                delete_sem(s->input_sem);

    int ret;

    st = s1->streams[0];
    s->sample_rate = st->codec.sample_rate;
    s->channels = st->codec.channels;
    ret = audio_open(s, 1, NULL);
    if (ret < 0)
        return -EIO;
    return 0;
}

        return -ENOMEM;
    }
    s->sample_rate = ap->sample_rate;
    s->channels = ap->channels;

    ret = audio_open(s, 0, ap->device);
    if (ret < 0) {
        av_free(st);
        return -EIO;
    }
    /* take real parameters */