mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-10 01:30:21 +02:00
![Michael Niedermayer](/assets/img/avatar_default.png)
* commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea': Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer G.723.1 demuxer and decoder Add a shift parameter to celp_lp_synthesis_filter() libopenjpeg: K&R formatting cosmetics yadif: use emms_c() instead of inline assembly for emms invocations. ac3: don't use different names for option tables in the template file. lavfi: use const for AVFilterPad declarations in all filters. adpcm: don't duplicate identical AVSampleFmt array for each encoder. configure: cosmetics: Group test dependencies together configure: add more passthrough flags in tms470 filter configure: move flag filtering functions out of if/else blocks Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/ac3enc_fixed.c libavcodec/allcodecs.c libavcodec/eac3enc.c libavcodec/g723_1.c libavcodec/g723_1_data.h libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/v210dec.h libavcodec/version.h libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_pixdesctest.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vf_showinfo.c libavfilter/vf_slicify.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/Makefile libavformat/allformats.c libavformat/g723_1.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
135 lines
4.6 KiB
C
135 lines
4.6 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 "internal.h"
|
|
#include "libavutil/audioconvert.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)
|
|
|
|
static const AVOption anullsrc_options[]= {
|
|
{ "channel_layout", "set channel_layout", OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, {.str = "stereo"}, 0, 0 },
|
|
{ "cl", "set channel_layout", OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, {.str = "stereo"}, 0, 0 },
|
|
{ "sample_rate", "set sample rate", OFFSET(sample_rate_str) , AV_OPT_TYPE_STRING, {.str = "44100"}, 0, 0 },
|
|
{ "r", "set sample rate", OFFSET(sample_rate_str) , AV_OPT_TYPE_STRING, {.str = "44100"}, 0, 0 },
|
|
{ "nb_samples", "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.dbl = 1024}, 0, INT_MAX },
|
|
{ "n", "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.dbl = 1024}, 0, INT_MAX },
|
|
{ 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) {
|
|
av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
|
|
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;
|
|
AVFilterBufferRef *samplesref;
|
|
|
|
samplesref =
|
|
ff_get_audio_buffer(outlink, AV_PERM_WRITE, null->nb_samples);
|
|
samplesref->pts = null->pts;
|
|
samplesref->pos = -1;
|
|
samplesref->audio->channel_layout = null->channel_layout;
|
|
samplesref->audio->sample_rate = outlink->sample_rate;
|
|
|
|
ff_filter_samples(outlink, avfilter_ref_buffer(samplesref, ~0));
|
|
avfilter_unref_buffer(samplesref);
|
|
|
|
null->pts += null->nb_samples;
|
|
return 0;
|
|
}
|
|
|
|
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 = (const AVFilterPad[]) {{ .name = NULL}},
|
|
|
|
.outputs = (const AVFilterPad[]) {{ .name = "default",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.config_props = config_props,
|
|
.request_frame = request_frame, },
|
|
{ .name = NULL}},
|
|
};
|