#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)
{
link = ctx->outputs[0];
if (samplesref->format != link->format ||
- samplesref->audio->channel_layout != link->channel_layout ||
- samplesref->audio->planar != link->planar) {
+ samplesref->audio->channel_layout != link->channel_layout) {
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");
} else {
link = abuffer->aconvert->outputs[0];
if (samplesref->format == link->format &&
- samplesref->audio->channel_layout == link->channel_layout &&
- samplesref->audio->planar == link->planar
- )
+ samplesref->audio->channel_layout == link->channel_layout)
remove_filter(&abuffer->aconvert);
else
if ((ret = reconfigure_filter(abuffer, abuffer->aconvert)) < 0)
{
AVFilterLink *outlink = ctx->outputs[0];
AVFilterBufferRef *buf;
+ int channels, data_size, i;
switch (outlink->type) {
ref->format, ref->video->w, ref->video->h);
break;
+ case AVMEDIA_TYPE_AUDIO:
+ buf = ff_get_audio_buffer(outlink, AV_PERM_WRITE,
+ ref->audio->nb_samples);
+ 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);
+ break;
+
default:
return NULL;
}
return av_buffersrc_add_ref(buffer_filter, picref, 0);
}
-int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf)
-{
- return av_buffersrc_add_ref(s, buf, AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT |
- AV_BUFFERSRC_FLAG_NO_COPY);
-}
-
#if CONFIG_AVCODEC
#include "avcodec.h"
-int av_vsrc_buffer_add_frame(AVFilterContext *buffer_src,
- const AVFrame *frame, int flags)
+int av_buffersrc_add_frame(AVFilterContext *buffer_src,
+ const AVFrame *frame, int flags)
{
- BufferSourceContext *c = buffer_src->priv;
AVFilterBufferRef *picref;
int ret;
- if (!frame) {
- c->eof = 1;
- return 0;
- } else if (c->eof)
- return AVERROR(EINVAL);
+ if (!frame) /* NULL for EOF */
+ return av_buffersrc_add_ref(buffer_src, NULL, flags);
- picref = avfilter_get_video_buffer_ref_from_frame(frame, AV_PERM_WRITE);
+ switch (buffer_src->outputs[0]->type) {
+ case AVMEDIA_TYPE_VIDEO:
+ picref = avfilter_get_video_buffer_ref_from_frame(frame, AV_PERM_WRITE);
+ break;
+ case AVMEDIA_TYPE_AUDIO:
+ picref = avfilter_get_audio_buffer_ref_from_frame(frame, AV_PERM_WRITE);
+ break;
+ default:
+ return AVERROR(ENOSYS);
+ }
if (!picref)
return AVERROR(ENOMEM);
- ret = av_vsrc_buffer_add_video_buffer_ref(buffer_src, picref, flags);
+ ret = av_buffersrc_add_ref(buffer_src, picref, flags);
picref->buf->data[0] = NULL;
avfilter_unref_buffer(picref);
-
return ret;
}
+
+int av_vsrc_buffer_add_frame(AVFilterContext *buffer_src,
+ const AVFrame *frame, int flags)
+{
+ return av_buffersrc_add_frame(buffer_src, frame, 0);
+}
#endif
+unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src)
+{
+ return ((BufferSourceContext *)buffer_src->priv)->nb_failed_requests;
+}
+
unsigned av_vsrc_buffer_get_nb_failed_requests(AVFilterContext *buffer_src)
{
return ((BufferSourceContext *)buffer_src->priv)->nb_failed_requests;
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);
-
- 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;
}
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);
samplesref->pts = pts;
samplesref->audio->sample_rate = sample_rate;
+ AV_NOWARN_DEPRECATED(
return av_asrc_buffer_add_audio_buffer_ref(ctx, samplesref, 0);
+ )
}
int av_asrc_buffer_add_buffer(AVFilterContext *ctx,
buf, nb_channels, nb_samples,
sample_fmt, 16);
+ AV_NOWARN_DEPRECATED(
return av_asrc_buffer_add_samples(ctx,
data, linesize, nb_samples,
sample_rate,
sample_fmt, channel_layout, planar,
pts, flags);
+ )
}
AVFilter avfilter_vsrc_buffer = {
{ .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