mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-12 19:18:44 +02:00
a05a44e205
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534
by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
154 lines
4.4 KiB
C
154 lines
4.4 KiB
C
/*
|
|
* This file is part of Libav.
|
|
*
|
|
* Libav 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,
|
|
* 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
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* Channel split filter
|
|
*
|
|
* Split an audio stream into per-channel streams.
|
|
*/
|
|
|
|
#include "libavutil/channel_layout.h"
|
|
#include "libavutil/internal.h"
|
|
#include "libavutil/opt.h"
|
|
|
|
#include "audio.h"
|
|
#include "avfilter.h"
|
|
#include "formats.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct ChannelSplitContext {
|
|
const AVClass *class;
|
|
|
|
uint64_t channel_layout;
|
|
char *channel_layout_str;
|
|
} ChannelSplitContext;
|
|
|
|
#define OFFSET(x) offsetof(ChannelSplitContext, x)
|
|
#define A AV_OPT_FLAG_AUDIO_PARAM
|
|
#define F AV_OPT_FLAG_FILTERING_PARAM
|
|
static const AVOption channelsplit_options[] = {
|
|
{ "channel_layout", "Input channel layout.", OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, { .str = "stereo" }, .flags = A|F },
|
|
{ NULL },
|
|
};
|
|
|
|
AVFILTER_DEFINE_CLASS(channelsplit);
|
|
|
|
static int init(AVFilterContext *ctx, const char *arg)
|
|
{
|
|
ChannelSplitContext *s = ctx->priv;
|
|
int nb_channels;
|
|
int ret = 0, i;
|
|
|
|
s->class = &channelsplit_class;
|
|
av_opt_set_defaults(s);
|
|
if ((ret = av_set_options_string(s, arg, "=", ":")) < 0)
|
|
return ret;
|
|
if (!(s->channel_layout = av_get_channel_layout(s->channel_layout_str))) {
|
|
av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout '%s'.\n",
|
|
s->channel_layout_str);
|
|
ret = AVERROR(EINVAL);
|
|
goto fail;
|
|
}
|
|
|
|
nb_channels = av_get_channel_layout_nb_channels(s->channel_layout);
|
|
for (i = 0; i < nb_channels; i++) {
|
|
uint64_t channel = av_channel_layout_extract_channel(s->channel_layout, i);
|
|
AVFilterPad pad = { 0 };
|
|
|
|
pad.type = AVMEDIA_TYPE_AUDIO;
|
|
pad.name = av_get_channel_name(channel);
|
|
|
|
ff_insert_outpad(ctx, i, &pad);
|
|
}
|
|
|
|
fail:
|
|
av_opt_free(s);
|
|
return ret;
|
|
}
|
|
|
|
static int query_formats(AVFilterContext *ctx)
|
|
{
|
|
ChannelSplitContext *s = ctx->priv;
|
|
AVFilterChannelLayouts *in_layouts = NULL;
|
|
int i;
|
|
|
|
ff_set_common_formats (ctx, ff_planar_sample_fmts());
|
|
ff_set_common_samplerates(ctx, ff_all_samplerates());
|
|
|
|
ff_add_channel_layout(&in_layouts, s->channel_layout);
|
|
ff_channel_layouts_ref(in_layouts, &ctx->inputs[0]->out_channel_layouts);
|
|
|
|
for (i = 0; i < ctx->nb_outputs; i++) {
|
|
AVFilterChannelLayouts *out_layouts = NULL;
|
|
uint64_t channel = av_channel_layout_extract_channel(s->channel_layout, i);
|
|
|
|
ff_add_channel_layout(&out_layouts, channel);
|
|
ff_channel_layouts_ref(out_layouts, &ctx->outputs[i]->in_channel_layouts);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
|
|
{
|
|
AVFilterContext *ctx = inlink->dst;
|
|
int i, ret = 0;
|
|
|
|
for (i = 0; i < ctx->nb_outputs; i++) {
|
|
AVFrame *buf_out = av_frame_clone(buf);
|
|
|
|
if (!buf_out) {
|
|
ret = AVERROR(ENOMEM);
|
|
break;
|
|
}
|
|
|
|
buf_out->data[0] = buf_out->extended_data[0] = buf_out->extended_data[i];
|
|
buf_out->channel_layout =
|
|
av_channel_layout_extract_channel(buf->channel_layout, i);
|
|
|
|
ret = ff_filter_frame(ctx->outputs[i], buf_out);
|
|
if (ret < 0)
|
|
break;
|
|
}
|
|
av_frame_free(&buf);
|
|
return ret;
|
|
}
|
|
|
|
static const AVFilterPad avfilter_af_channelsplit_inputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.filter_frame = filter_frame,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
AVFilter avfilter_af_channelsplit = {
|
|
.name = "channelsplit",
|
|
.description = NULL_IF_CONFIG_SMALL("Split audio into per-channel streams"),
|
|
.priv_size = sizeof(ChannelSplitContext),
|
|
|
|
.init = init,
|
|
.query_formats = query_formats,
|
|
|
|
.inputs = avfilter_af_channelsplit_inputs,
|
|
.outputs = NULL,
|
|
.priv_class = &channelsplit_class,
|
|
};
|