comparison beosaudio.cpp @ 95:89e992063014 libavformat

cleanup; unused pipe() stuff removed.

94:79b7d70d6c37

}

/* enable performance checks */
//#define PERF_CHECK

/* Pipes are 4k in BeOS IIRC */
#define AUDIO_BLOCK_SIZE 4096
//#define AUDIO_BLOCK_SIZE 2048
#define AUDIO_BLOCK_COUNT 8

#define AUDIO_BUFFER_SIZE (AUDIO_BLOCK_SIZE*AUDIO_BLOCK_COUNT)

/* pipes suck for realtime */
#define USE_RING_BUFFER 1

typedef struct {
    int fd;
    int sample_rate;
    int channels;
    int frame_size; /* in bytes ! */
    CodecID codec_id;
    int flip_left : 1;
    uint8_t buffer[AUDIO_BUFFER_SIZE];
    int buffer_ptr;
    int pipefd; /* the other end of the pipe */
    /* ring buffer */
    sem_id input_sem;
    int input_index;
    sem_id output_sem;
    int output_index;

    while (bufferSize > 0) {
#ifdef PERF_CHECK
        bigtime_t t;
        t = system_time();
#endif
#ifdef USE_RING_BUFFER
        len = MIN(AUDIO_BLOCK_SIZE, bufferSize);
        if (acquire_sem_etc(s->output_sem, len, B_CAN_INTERRUPT, 0LL) < B_OK) {
            s->has_quit = 1;
            s->player->SetHasData(false);
            return;

            memcpy(buf + amount, &s->buffer[s->output_index], len - amount);
            s->output_index += len-amount;
            s->output_index %= AUDIO_BUFFER_SIZE;
        }
        release_sem_etc(s->input_sem, len, 0);
#else
        len = read(s->pipefd, buf, bufferSize);
#endif
#ifdef PERF_CHECK
        t = system_time() - t;
        s->starve_time = MAX(s->starve_time, t);
#endif
#ifndef USE_RING_BUFFER
        if (len < B_OK) {
            puts("EPIPE");
            s->player->SetHasData(false);
            snooze(100000);
            return;
        }
        if (len == 0) {
            s->player->SetHasData(false);
            snooze(100000);
            return;
        }
#endif
        buf += len;
        bufferSize -= len;
    }
}

    int ret;
    media_raw_audio_format format;

    if (!is_output)
        return -EIO; /* not for now */
#ifdef USE_RING_BUFFER
    s->input_sem = create_sem(AUDIO_BUFFER_SIZE, "ffmpeg_ringbuffer_input");
//    s->input_sem = create_sem(AUDIO_BLOCK_SIZE, "ffmpeg_ringbuffer_input");
    if (s->input_sem < B_OK)
        return -EIO;
    s->output_sem = create_sem(0, "ffmpeg_ringbuffer_output");

        return -EIO;
    }
    s->input_index = 0;
    s->output_index = 0;
    s->queued = 0;
#else
    ret = pipe(p);
    if (ret < 0)
        return -EIO;
    s->fd = p[is_output?1:0];
    s->pipefd = p[is_output?0:1];
    if (s->fd < 0) {
        perror(is_output?"audio out":"audio in");
        return -EIO;
    }
#endif
    create_bapp_if_needed();
    /* non blocking mode */
//    fcntl(s->fd, F_SETFL, O_NONBLOCK);
//    fcntl(s->pipefd, F_SETFL, O_NONBLOCK);
    s->frame_size = AUDIO_BLOCK_SIZE;
    format = media_raw_audio_format::wildcard;
    format.format = media_raw_audio_format::B_AUDIO_SHORT;
    format.byte_order = B_HOST_IS_LENDIAN ? B_MEDIA_LITTLE_ENDIAN : B_MEDIA_BIG_ENDIAN;
    format.channel_count = s->channels;

    format.frame_rate = s->sample_rate;
    s->player = new BSoundPlayer(&format, "ffmpeg output", audioplay_callback);
    if (s->player->InitCheck() != B_OK) {
        delete s->player;
        s->player = NULL;
#ifdef USE_RING_BUFFER
    if (s->input_sem)
        delete_sem(s->input_sem);
    if (s->output_sem)
        delete_sem(s->output_sem);
#else
        close(s->fd);
        close(s->pipefd);
#endif
        return -EIO;
    }
    s->player->SetCookie(s);
    s->player->SetVolume(1.0);
    s->player->Start();

    return 0;
}

static int audio_close(AudioData *s)
{
#ifdef USE_RING_BUFFER
    if (s->input_sem)
        delete_sem(s->input_sem);
    if (s->output_sem)
        delete_sem(s->output_sem);
#endif
    s->has_quit = 1;
    if (s->player) {
        s->player->Stop();
    }
    if (s->player)
        delete s->player;
#ifndef USE_RING_BUFFER
    close(s->pipefd);
    close(s->fd);
#endif
    destroy_bapp_if_needed();
    return 0;
}

/* sound output support */

#ifdef PERF_CHECK
    bigtime_t t = s->starve_time;
    s->starve_time = 0;
    printf("starve_time: %lld    \n", t);
#endif
#ifdef USE_RING_BUFFER
    while (size > 0) {
        int amount;
        len = MIN(size, AUDIO_BLOCK_SIZE);
        if (acquire_sem_etc(s->input_sem, len, B_CAN_INTERRUPT, 0LL) < B_OK)
            return -EIO;

        }
        release_sem_etc(s->output_sem, len, 0);
        buf += len;
        size -= len;
    }
#else
    while (size > 0) {
        len = AUDIO_BLOCK_SIZE - s->buffer_ptr;
        if (len > size)
            len = size;
        memcpy(s->buffer + s->buffer_ptr, buf, len);
        s->buffer_ptr += len;
        if (s->buffer_ptr >= AUDIO_BLOCK_SIZE) {
            for(;;) {
//snooze(1000);
                ret = write(s->fd, s->buffer, AUDIO_BLOCK_SIZE);
                if (ret != 0)
                    break;
                if (ret < 0 && (errno != EAGAIN && errno != EINTR))
                    return -EIO;
            }
            s->buffer_ptr = 0;
        }
        buf += len;
        size -= len;
    }
#endif
    return 0;
}

static int audio_write_trailer(AVFormatContext *s1)
{

            av_free_packet(pkt);
            return -EIO;
        }
    }
    pkt->size = ret;
    if (s->flip_left && s->channels == 2) {
        int i;
        short *p = (short *) pkt->data;

        for (i = 0; i < ret; i += 4) {
            *p = ~*p;
            p += 2;
        }
    }
    return 0;
}

static int audio_read_close(AVFormatContext *s1)
{

95:89e992063014

}

/* enable performance checks */
//#define PERF_CHECK

#define AUDIO_BLOCK_SIZE 4096
//#define AUDIO_BLOCK_SIZE 2048
#define AUDIO_BLOCK_COUNT 8

#define AUDIO_BUFFER_SIZE (AUDIO_BLOCK_SIZE*AUDIO_BLOCK_COUNT)

typedef struct {
    int fd; // UNUSED
    int sample_rate;
    int channels;
    int frame_size; /* in bytes ! */
    CodecID codec_id;
    uint8_t buffer[AUDIO_BUFFER_SIZE];
    int buffer_ptr;
    /* ring buffer */
    sem_id input_sem;
    int input_index;
    sem_id output_sem;
    int output_index;

    while (bufferSize > 0) {
#ifdef PERF_CHECK
        bigtime_t t;
        t = system_time();
#endif
        len = MIN(AUDIO_BLOCK_SIZE, bufferSize);
        if (acquire_sem_etc(s->output_sem, len, B_CAN_INTERRUPT, 0LL) < B_OK) {
            s->has_quit = 1;
            s->player->SetHasData(false);
            return;

            memcpy(buf + amount, &s->buffer[s->output_index], len - amount);
            s->output_index += len-amount;
            s->output_index %= AUDIO_BUFFER_SIZE;
        }
        release_sem_etc(s->input_sem, len, 0);
#ifdef PERF_CHECK
        t = system_time() - t;
        s->starve_time = MAX(s->starve_time, t);
#endif
        buf += len;
        bufferSize -= len;
    }
}

    int ret;
    media_raw_audio_format format;

    if (!is_output)
        return -EIO; /* not for now */
    s->input_sem = create_sem(AUDIO_BUFFER_SIZE, "ffmpeg_ringbuffer_input");
//    s->input_sem = create_sem(AUDIO_BLOCK_SIZE, "ffmpeg_ringbuffer_input");
    if (s->input_sem < B_OK)
        return -EIO;
    s->output_sem = create_sem(0, "ffmpeg_ringbuffer_output");

        return -EIO;
    }
    s->input_index = 0;
    s->output_index = 0;
    s->queued = 0;
    create_bapp_if_needed();
    s->frame_size = AUDIO_BLOCK_SIZE;
    format = media_raw_audio_format::wildcard;
    format.format = media_raw_audio_format::B_AUDIO_SHORT;
    format.byte_order = B_HOST_IS_LENDIAN ? B_MEDIA_LITTLE_ENDIAN : B_MEDIA_BIG_ENDIAN;
    format.channel_count = s->channels;

    format.frame_rate = s->sample_rate;
    s->player = new BSoundPlayer(&format, "ffmpeg output", audioplay_callback);
    if (s->player->InitCheck() != B_OK) {
        delete s->player;
        s->player = NULL;
    if (s->input_sem)
        delete_sem(s->input_sem);
    if (s->output_sem)
        delete_sem(s->output_sem);
        return -EIO;
    }
    s->player->SetCookie(s);
    s->player->SetVolume(1.0);
    s->player->Start();

    return 0;
}

static int audio_close(AudioData *s)
{
    if (s->input_sem)
        delete_sem(s->input_sem);
    if (s->output_sem)
        delete_sem(s->output_sem);
    s->has_quit = 1;
    if (s->player) {
        s->player->Stop();
    }
    if (s->player)
        delete s->player;
    destroy_bapp_if_needed();
    return 0;
}

/* sound output support */

#ifdef PERF_CHECK
    bigtime_t t = s->starve_time;
    s->starve_time = 0;
    printf("starve_time: %lld    \n", t);
#endif
    while (size > 0) {
        int amount;
        len = MIN(size, AUDIO_BLOCK_SIZE);
        if (acquire_sem_etc(s->input_sem, len, B_CAN_INTERRUPT, 0LL) < B_OK)
            return -EIO;

        }
        release_sem_etc(s->output_sem, len, 0);
        buf += len;
        size -= len;
    }
    return 0;
}

static int audio_write_trailer(AVFormatContext *s1)
{

            av_free_packet(pkt);
            return -EIO;
        }
    }
    pkt->size = ret;
    return 0;
}

static int audio_read_close(AVFormatContext *s1)
{