diff options
Diffstat (limited to 'libavdevice/jack.c')
| -rw-r--r-- | libavdevice/jack.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/libavdevice/jack.c b/libavdevice/jack.c index c31c4ce5b3..e35a4a815a 100644 --- a/libavdevice/jack.c +++ b/libavdevice/jack.c @@ -3,20 +3,20 @@ * Copyright (c) 2009 Samalyse * Author: Olivier Guilyardi <olivier samalyse com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -33,6 +33,7 @@ #include "libavformat/avformat.h" #include "libavformat/internal.h" #include "timefilter.h" +#include "avdevice.h" /** * Size of the internal FIFO buffers as a number of audio packets @@ -148,7 +149,6 @@ static int start_jack(AVFormatContext *context) JackData *self = context->priv_data; jack_status_t status; int i, test; - double o, period; /* Register as a JACK client, using the context filename as client name. */ self->client = jack_client_open(context->filename, JackNullOption, &status); @@ -160,7 +160,7 @@ static int start_jack(AVFormatContext *context) sem_init(&self->packet_count, 0, 0); self->sample_rate = jack_get_sample_rate(self->client); - self->ports = av_malloc(self->nports * sizeof(*self->ports)); + self->ports = av_malloc_array(self->nports, sizeof(*self->ports)); if (!self->ports) return AVERROR(ENOMEM); self->buffer_size = jack_get_buffer_size(self->client); @@ -186,18 +186,16 @@ static int start_jack(AVFormatContext *context) jack_set_xrun_callback(self->client, xrun_callback, self); /* Create time filter */ - period = (double) self->buffer_size / self->sample_rate; - o = 2 * M_PI * 1.5 * period; /// bandwidth: 1.5Hz - self->timefilter = ff_timefilter_new (1.0 / self->sample_rate, sqrt(2 * o), o * o); + self->timefilter = ff_timefilter_new (1.0 / self->sample_rate, self->buffer_size, 1.5); if (!self->timefilter) { jack_client_close(self->client); return AVERROR(ENOMEM); } /* Create FIFO buffers */ - self->filled_pkts = av_fifo_alloc(FIFO_PACKETS_NUM * sizeof(AVPacket)); + self->filled_pkts = av_fifo_alloc_array(FIFO_PACKETS_NUM, sizeof(AVPacket)); /* New packets FIFO with one extra packet for safety against underruns */ - self->new_pkts = av_fifo_alloc((FIFO_PACKETS_NUM + 1) * sizeof(AVPacket)); + self->new_pkts = av_fifo_alloc_array((FIFO_PACKETS_NUM + 1), sizeof(AVPacket)); if (!self->new_pkts) { jack_client_close(self->client); return AVERROR(ENOMEM); @@ -211,14 +209,14 @@ static int start_jack(AVFormatContext *context) } -static void free_pkt_fifo(AVFifoBuffer *fifo) +static void free_pkt_fifo(AVFifoBuffer **fifo) { AVPacket pkt; - while (av_fifo_size(fifo)) { - av_fifo_generic_read(fifo, &pkt, sizeof(pkt), NULL); + while (av_fifo_size(*fifo)) { + av_fifo_generic_read(*fifo, &pkt, sizeof(pkt), NULL); av_packet_unref(&pkt); } - av_fifo_free(fifo); + av_fifo_freep(fifo); } static void stop_jack(JackData *self) @@ -229,8 +227,8 @@ static void stop_jack(JackData *self) jack_client_close(self->client); } sem_destroy(&self->packet_count); - free_pkt_fifo(self->new_pkts); - free_pkt_fifo(self->filled_pkts); + free_pkt_fifo(&self->new_pkts); + free_pkt_fifo(&self->filled_pkts); av_freep(&self->ports); ff_timefilter_destroy(self->timefilter); } @@ -341,6 +339,7 @@ static const AVClass jack_indev_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, }; AVInputFormat ff_jack_demuxer = { |