mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01: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>
141 lines
4.5 KiB
C
141 lines
4.5 KiB
C
/*
|
|
* Copyright 2010 S.N. Hemanth Meenakshisundaram <smeenaks ucsd edu>
|
|
* Copyright 2010 Stefano Sabatini <stefano.sabatini-lala poste it>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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 FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* null audio source
|
|
*/
|
|
|
|
#include <inttypes.h>
|
|
#include <stdio.h>
|
|
|
|
#include "libavutil/channel_layout.h"
|
|
#include "libavutil/internal.h"
|
|
#include "libavutil/opt.h"
|
|
#include "audio.h"
|
|
#include "avfilter.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct {
|
|
const AVClass *class;
|
|
char *channel_layout_str;
|
|
uint64_t channel_layout;
|
|
char *sample_rate_str;
|
|
int sample_rate;
|
|
int nb_samples; ///< number of samples per requested frame
|
|
int64_t pts;
|
|
} ANullContext;
|
|
|
|
#define OFFSET(x) offsetof(ANullContext, x)
|
|
#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
|
|
|
|
static const AVOption anullsrc_options[]= {
|
|
{ "channel_layout", "set channel_layout", OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, {.str = "stereo"}, 0, 0, FLAGS },
|
|
{ "cl", "set channel_layout", OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, {.str = "stereo"}, 0, 0, FLAGS },
|
|
{ "sample_rate", "set sample rate", OFFSET(sample_rate_str) , AV_OPT_TYPE_STRING, {.str = "44100"}, 0, 0, FLAGS },
|
|
{ "r", "set sample rate", OFFSET(sample_rate_str) , AV_OPT_TYPE_STRING, {.str = "44100"}, 0, 0, FLAGS },
|
|
{ "nb_samples", "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.i64 = 1024}, 0, INT_MAX, FLAGS },
|
|
{ "n", "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.i64 = 1024}, 0, INT_MAX, FLAGS },
|
|
{ NULL },
|
|
};
|
|
|
|
AVFILTER_DEFINE_CLASS(anullsrc);
|
|
|
|
static int init(AVFilterContext *ctx, const char *args)
|
|
{
|
|
ANullContext *null = ctx->priv;
|
|
int ret;
|
|
|
|
null->class = &anullsrc_class;
|
|
av_opt_set_defaults(null);
|
|
|
|
if ((ret = (av_set_options_string(null, args, "=", ":"))) < 0)
|
|
return ret;
|
|
|
|
if ((ret = ff_parse_sample_rate(&null->sample_rate,
|
|
null->sample_rate_str, ctx)) < 0)
|
|
return ret;
|
|
|
|
if ((ret = ff_parse_channel_layout(&null->channel_layout,
|
|
null->channel_layout_str, ctx)) < 0)
|
|
return ret;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int config_props(AVFilterLink *outlink)
|
|
{
|
|
ANullContext *null = outlink->src->priv;
|
|
char buf[128];
|
|
int chans_nb;
|
|
|
|
outlink->sample_rate = null->sample_rate;
|
|
outlink->channel_layout = null->channel_layout;
|
|
|
|
chans_nb = av_get_channel_layout_nb_channels(null->channel_layout);
|
|
av_get_channel_layout_string(buf, sizeof(buf), chans_nb, null->channel_layout);
|
|
av_log(outlink->src, AV_LOG_VERBOSE,
|
|
"sample_rate:%d channel_layout:'%s' nb_samples:%d\n",
|
|
null->sample_rate, buf, null->nb_samples);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int request_frame(AVFilterLink *outlink)
|
|
{
|
|
ANullContext *null = outlink->src->priv;
|
|
AVFrame *samplesref;
|
|
|
|
samplesref = ff_get_audio_buffer(outlink, null->nb_samples);
|
|
samplesref->pts = null->pts;
|
|
samplesref->channel_layout = null->channel_layout;
|
|
samplesref->sample_rate = outlink->sample_rate;
|
|
|
|
ff_filter_frame(outlink, av_frame_clone(samplesref));
|
|
av_frame_free(&samplesref);
|
|
|
|
null->pts += null->nb_samples;
|
|
return 0;
|
|
}
|
|
|
|
static const AVFilterPad avfilter_asrc_anullsrc_outputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.config_props = config_props,
|
|
.request_frame = request_frame,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
AVFilter avfilter_asrc_anullsrc = {
|
|
.name = "anullsrc",
|
|
.description = NULL_IF_CONFIG_SMALL("Null audio source, return empty audio frames."),
|
|
|
|
.init = init,
|
|
.priv_size = sizeof(ANullContext),
|
|
|
|
.inputs = NULL,
|
|
|
|
.outputs = avfilter_asrc_anullsrc_outputs,
|
|
.priv_class = &anullsrc_class,
|
|
};
|