#include "avfilter.h"
#include "internal.h"
+#include "audio.h"
#include "avcodec.h"
#include "buffersrc.h"
#include "vsrc_buffer.h"
int sample_rate;
unsigned int sample_format;
int64_t channel_layout;
- int packing_format;
// Normalization filters
AVFilterContext *aconvert;
return AVERROR(EINVAL);\
}
+static void buf_free(AVFilterBuffer *ptr)
+{
+ av_free(ptr);
+ return;
+}
+
+static void set_link_source(AVFilterContext *src, AVFilterLink *link)
+{
+ link->src = src;
+ link->srcpad = &(src->output_pads[0]);
+ src->outputs[0] = link;
+}
+
+static int reconfigure_filter(BufferSourceContext *abuffer, AVFilterContext *filt_ctx)
+{
+ int ret;
+ AVFilterLink * const inlink = filt_ctx->inputs[0];
+ AVFilterLink * const outlink = filt_ctx->outputs[0];
+
+ inlink->format = abuffer->sample_format;
+ inlink->channel_layout = abuffer->channel_layout;
+ inlink->sample_rate = abuffer->sample_rate;
+
+ filt_ctx->filter->uninit(filt_ctx);
+ memset(filt_ctx->priv, 0, filt_ctx->filter->priv_size);
+ if ((ret = filt_ctx->filter->init(filt_ctx, NULL , NULL)) < 0)
+ return ret;
+ if ((ret = inlink->srcpad->config_props(inlink)) < 0)
+ return ret;
+ return outlink->srcpad->config_props(outlink);
+}
+
static int insert_filter(BufferSourceContext *abuffer,
AVFilterLink *link, AVFilterContext **filt_ctx,
- const char *filt_name);
-static void remove_filter(AVFilterContext **filt_ctx);
-static int reconfigure_filter(BufferSourceContext *abuffer, AVFilterContext *filt_ctx);
+ const char *filt_name)
+{
+ int ret;
+
+ if ((ret = avfilter_open(filt_ctx, avfilter_get_by_name(filt_name), NULL)) < 0)
+ return ret;
+
+ link->src->outputs[0] = NULL;
+ if ((ret = avfilter_link(link->src, 0, *filt_ctx, 0)) < 0) {
+ link->src->outputs[0] = link;
+ return ret;
+ }
+
+ set_link_source(*filt_ctx, link);
+
+ if ((ret = reconfigure_filter(abuffer, *filt_ctx)) < 0) {
+ avfilter_free(*filt_ctx);
+ return ret;
+ }
+
+ return 0;
+}
+
+static void remove_filter(AVFilterContext **filt_ctx)
+{
+ AVFilterLink *outlink = (*filt_ctx)->outputs[0];
+ AVFilterContext *src = (*filt_ctx)->inputs[0]->src;
+
+ (*filt_ctx)->outputs[0] = NULL;
+ avfilter_free(*filt_ctx);
+ *filt_ctx = NULL;
+
+ set_link_source(src, outlink);
+}
static inline void log_input_change(void *ctx, AVFilterLink *link, AVFilterBufferRef *ref)
{
int ret, logged = 0;
link = ctx->outputs[0];
- if (samplesref->audio->sample_rate != link->sample_rate) {
+ if (samplesref->audio->sample_rate != link->sample_rate ||
+ samplesref->format != link->format ||
+ samplesref->audio->channel_layout != link->channel_layout) {
log_input_change(ctx, link, samplesref);
logged = 1;
- abuffer->sample_rate = samplesref->audio->sample_rate;
+ abuffer->sample_rate = samplesref->audio->sample_rate;
+ abuffer->sample_format = samplesref->format;
+ abuffer->channel_layout = samplesref->audio->channel_layout;
if (!abuffer->aresample) {
ret = insert_filter(abuffer, link, &abuffer->aresample, "aresample");
if (ret < 0) return ret;
} else {
link = abuffer->aresample->outputs[0];
- if (samplesref->audio->sample_rate == link->sample_rate)
+ if (samplesref->audio->sample_rate == link->sample_rate &&
+ samplesref->format == link->format &&
+ samplesref->audio->channel_layout == link->channel_layout)
remove_filter(&abuffer->aresample);
else
if ((ret = reconfigure_filter(abuffer, abuffer->aresample)) < 0)
}
}
- link = ctx->outputs[0];
- if (samplesref->format != link->format ||
- samplesref->audio->channel_layout != link->channel_layout ||
- samplesref->audio->planar != link->planar) {
-
- if (!logged) log_input_change(ctx, link, samplesref);
-
- abuffer->sample_format = samplesref->format;
- abuffer->channel_layout = samplesref->audio->channel_layout;
- abuffer->packing_format = samplesref->audio->planar;
-
- if (!abuffer->aconvert) {
- ret = insert_filter(abuffer, link, &abuffer->aconvert, "aconvert");
- if (ret < 0) return ret;
- } else {
- link = abuffer->aconvert->outputs[0];
- if (samplesref->format == link->format &&
- samplesref->audio->channel_layout == link->channel_layout &&
- samplesref->audio->planar == link->planar
- )
- remove_filter(&abuffer->aconvert);
- else
- if ((ret = reconfigure_filter(abuffer, abuffer->aconvert)) < 0)
- return ret;
- }
- }
return 0;
}
case AVMEDIA_TYPE_VIDEO:
buf = avfilter_get_video_buffer(outlink, AV_PERM_WRITE,
ref->video->w, ref->video->h);
+ if(!buf)
+ return NULL;
av_image_copy(buf->data, buf->linesize,
(void*)ref->data, ref->linesize,
ref->format, ref->video->w, ref->video->h);
break;
case AVMEDIA_TYPE_AUDIO:
- buf = avfilter_get_audio_buffer(outlink, AV_PERM_WRITE,
+ buf = ff_get_audio_buffer(outlink, AV_PERM_WRITE,
ref->audio->nb_samples);
+ if(!buf)
+ return NULL;
channels = av_get_channel_layout_nb_channels(ref->audio->channel_layout);
- data_size = av_samples_get_buffer_size(NULL, channels,
- ref->audio->nb_samples,
- ref->format, 1);
- for (i = 0; i < FF_ARRAY_ELEMS(ref->buf->data) && ref->buf->data[i]; i++)
- memcpy(buf->buf->data[i], ref->buf->data[i], data_size);
+ av_samples_copy(buf->extended_data, ref->buf->extended_data,
+ 0, 0, ref->audio->nb_samples,
+ channels,
+ ref->format);
break;
default:
buf = picref;
else
buf = copy_buffer_ref(buffer_filter, picref);
+ if(!buf)
+ return -1;
if ((ret = av_fifo_generic_write(c->fifo, &buf, sizeof(buf), NULL)) < 0) {
if (buf != picref)
if (*args) \
arg = av_strtok(NULL, ":", &ptr)
+ ADD_FORMAT(time_base);
ADD_FORMAT(sample_rate);
ADD_FORMAT(sample_format);
ADD_FORMAT(channel_layout);
- ADD_FORMAT(packing_format);
abuffer->fifo = av_fifo_alloc(FIFO_SIZE*sizeof(AVFilterBufferRef*));
if (!abuffer->fifo) {
arg_fail:
av_log(ctx, AV_LOG_ERROR, "Invalid arguments, must be of the form "
- "sample_rate:sample_fmt:channel_layout:packing\n");
+ "sample_rate:sample_fmt:channel_layout\n");
av_freep(&args);
return AVERROR(EINVAL);
}
{
BufferSourceContext *abuffer = ctx->priv;
AVFilterFormats *formats;
+ AVFilterChannelLayouts *layouts;
formats = NULL;
avfilter_add_format(&formats, abuffer->sample_format);
avfilter_set_common_sample_formats(ctx, formats);
formats = NULL;
- avfilter_add_format(&formats, abuffer->channel_layout);
- avfilter_set_common_channel_layouts(ctx, formats);
+ avfilter_add_format(&formats, abuffer->sample_rate);
+ ff_set_common_samplerates(ctx, formats);
- formats = NULL;
- avfilter_add_format(&formats, abuffer->packing_format);
- avfilter_set_common_packing_formats(ctx, formats);
+ layouts = NULL;
+ ff_add_channel_layout(&layouts, abuffer->channel_layout);
+ ff_set_common_channel_layouts(ctx, layouts);
return 0;
}
{
BufferSourceContext *abuffer = outlink->src->priv;
outlink->sample_rate = abuffer->sample_rate;
+ outlink->time_base = abuffer->time_base;
return 0;
}
avfilter_unref_buffer(buf);
break;
case AVMEDIA_TYPE_AUDIO:
- avfilter_filter_samples(link, avfilter_ref_buffer(buf, ~0));
+ ff_filter_samples(link, avfilter_ref_buffer(buf, ~0));
avfilter_unref_buffer(buf);
break;
default:
return size/sizeof(AVFilterBufferRef*);
}
-static void buf_free(AVFilterBuffer *ptr)
-{
- av_free(ptr);
- return;
-}
-
-static void set_link_source(AVFilterContext *src, AVFilterLink *link)
-{
- link->src = src;
- link->srcpad = &(src->output_pads[0]);
- src->outputs[0] = link;
-}
-
-static int reconfigure_filter(BufferSourceContext *abuffer, AVFilterContext *filt_ctx)
-{
- int ret;
- AVFilterLink * const inlink = filt_ctx->inputs[0];
- AVFilterLink * const outlink = filt_ctx->outputs[0];
-
- inlink->format = abuffer->sample_format;
- inlink->channel_layout = abuffer->channel_layout;
- inlink->planar = abuffer->packing_format;
- inlink->sample_rate = abuffer->sample_rate;
-
- filt_ctx->filter->uninit(filt_ctx);
- memset(filt_ctx->priv, 0, filt_ctx->filter->priv_size);
- if ((ret = filt_ctx->filter->init(filt_ctx, NULL , NULL)) < 0)
- return ret;
- if ((ret = inlink->srcpad->config_props(inlink)) < 0)
- return ret;
- return outlink->srcpad->config_props(outlink);
-}
-
-static int insert_filter(BufferSourceContext *abuffer,
- AVFilterLink *link, AVFilterContext **filt_ctx,
- const char *filt_name)
-{
- int ret;
-
- if ((ret = avfilter_open(filt_ctx, avfilter_get_by_name(filt_name), NULL)) < 0)
- return ret;
-
- link->src->outputs[0] = NULL;
- if ((ret = avfilter_link(link->src, 0, *filt_ctx, 0)) < 0) {
- link->src->outputs[0] = link;
- return ret;
- }
-
- set_link_source(*filt_ctx, link);
-
- if ((ret = reconfigure_filter(abuffer, *filt_ctx)) < 0) {
- avfilter_free(*filt_ctx);
- return ret;
- }
-
- return 0;
-}
-
-static void remove_filter(AVFilterContext **filt_ctx)
-{
- AVFilterLink *outlink = (*filt_ctx)->outputs[0];
- AVFilterContext *src = (*filt_ctx)->inputs[0]->src;
-
- (*filt_ctx)->outputs[0] = NULL;
- avfilter_free(*filt_ctx);
- *filt_ctx = NULL;
-
- set_link_source(src, outlink);
-}
-
int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *ctx,
AVFilterBufferRef *samplesref,
int av_unused flags)
AVFilterBufferRef *samplesref;
samplesref = avfilter_get_audio_buffer_ref_from_arrays(
- data, linesize, AV_PERM_WRITE,
+ data, linesize[0], AV_PERM_WRITE,
nb_samples,
- sample_fmt, channel_layout, planar);
+ sample_fmt, channel_layout);
if (!samplesref)
return AVERROR(ENOMEM);
{ .name = NULL}},
};
-#ifdef CONFIG_ABUFFER_FILTER
-
AVFilter avfilter_asrc_abuffer = {
.name = "abuffer",
.description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them accessible to the filterchain."),
{ .name = NULL}},
};
-#endif
projects / ffmpeg / blobdiff