* 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
      759001c534287a96dc96d1e274665feb7059145d 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>
		
	
			
		
			
				
	
	
		
			208 lines
		
	
	
		
			6.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			208 lines
		
	
	
		
			6.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 2012 Andrey Utkin
 | 
						|
 * Copyright (c) 2012 Stefano Sabatini
 | 
						|
 *
 | 
						|
 * 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
 | 
						|
 * Filter that changes number of samples on single output operation
 | 
						|
 */
 | 
						|
 | 
						|
#include "libavutil/audio_fifo.h"
 | 
						|
#include "libavutil/avassert.h"
 | 
						|
#include "libavutil/channel_layout.h"
 | 
						|
#include "libavutil/opt.h"
 | 
						|
#include "avfilter.h"
 | 
						|
#include "audio.h"
 | 
						|
#include "internal.h"
 | 
						|
#include "formats.h"
 | 
						|
 | 
						|
typedef struct {
 | 
						|
    const AVClass *class;
 | 
						|
    int nb_out_samples;  ///< how many samples to output
 | 
						|
    AVAudioFifo *fifo;   ///< samples are queued here
 | 
						|
    int64_t next_out_pts;
 | 
						|
    int req_fullfilled;
 | 
						|
    int pad;
 | 
						|
} ASNSContext;
 | 
						|
 | 
						|
#define OFFSET(x) offsetof(ASNSContext, x)
 | 
						|
#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
 | 
						|
 | 
						|
static const AVOption asetnsamples_options[] = {
 | 
						|
{ "pad", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
 | 
						|
{ "p",   "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
 | 
						|
{ "nb_out_samples", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
 | 
						|
{ "n",              "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
 | 
						|
{ NULL }
 | 
						|
};
 | 
						|
 | 
						|
AVFILTER_DEFINE_CLASS(asetnsamples);
 | 
						|
 | 
						|
static av_cold int init(AVFilterContext *ctx, const char *args)
 | 
						|
{
 | 
						|
    ASNSContext *asns = ctx->priv;
 | 
						|
    int err;
 | 
						|
 | 
						|
    asns->class = &asetnsamples_class;
 | 
						|
    av_opt_set_defaults(asns);
 | 
						|
 | 
						|
    if ((err = av_set_options_string(asns, args, "=", ":")) < 0)
 | 
						|
        return err;
 | 
						|
 | 
						|
    asns->next_out_pts = AV_NOPTS_VALUE;
 | 
						|
    av_log(ctx, AV_LOG_VERBOSE, "nb_out_samples:%d pad:%d\n", asns->nb_out_samples, asns->pad);
 | 
						|
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static av_cold void uninit(AVFilterContext *ctx)
 | 
						|
{
 | 
						|
    ASNSContext *asns = ctx->priv;
 | 
						|
    av_audio_fifo_free(asns->fifo);
 | 
						|
}
 | 
						|
 | 
						|
static int config_props_output(AVFilterLink *outlink)
 | 
						|
{
 | 
						|
    ASNSContext *asns = outlink->src->priv;
 | 
						|
    int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout);
 | 
						|
 | 
						|
    asns->fifo = av_audio_fifo_alloc(outlink->format, nb_channels, asns->nb_out_samples);
 | 
						|
    if (!asns->fifo)
 | 
						|
        return AVERROR(ENOMEM);
 | 
						|
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int push_samples(AVFilterLink *outlink)
 | 
						|
{
 | 
						|
    ASNSContext *asns = outlink->src->priv;
 | 
						|
    AVFrame *outsamples = NULL;
 | 
						|
    int nb_out_samples, nb_pad_samples;
 | 
						|
 | 
						|
    if (asns->pad) {
 | 
						|
        nb_out_samples = av_audio_fifo_size(asns->fifo) ? asns->nb_out_samples : 0;
 | 
						|
        nb_pad_samples = nb_out_samples - FFMIN(nb_out_samples, av_audio_fifo_size(asns->fifo));
 | 
						|
    } else {
 | 
						|
        nb_out_samples = FFMIN(asns->nb_out_samples, av_audio_fifo_size(asns->fifo));
 | 
						|
        nb_pad_samples = 0;
 | 
						|
    }
 | 
						|
 | 
						|
    if (!nb_out_samples)
 | 
						|
        return 0;
 | 
						|
 | 
						|
    outsamples = ff_get_audio_buffer(outlink, nb_out_samples);
 | 
						|
    av_assert0(outsamples);
 | 
						|
 | 
						|
    av_audio_fifo_read(asns->fifo,
 | 
						|
                       (void **)outsamples->extended_data, nb_out_samples);
 | 
						|
 | 
						|
    if (nb_pad_samples)
 | 
						|
        av_samples_set_silence(outsamples->extended_data, nb_out_samples - nb_pad_samples,
 | 
						|
                               nb_pad_samples, av_get_channel_layout_nb_channels(outlink->channel_layout),
 | 
						|
                               outlink->format);
 | 
						|
    outsamples->nb_samples     = nb_out_samples;
 | 
						|
    outsamples->channel_layout = outlink->channel_layout;
 | 
						|
    outsamples->sample_rate    = outlink->sample_rate;
 | 
						|
    outsamples->pts = asns->next_out_pts;
 | 
						|
 | 
						|
    if (asns->next_out_pts != AV_NOPTS_VALUE)
 | 
						|
        asns->next_out_pts += nb_out_samples;
 | 
						|
 | 
						|
    ff_filter_frame(outlink, outsamples);
 | 
						|
    asns->req_fullfilled = 1;
 | 
						|
    return nb_out_samples;
 | 
						|
}
 | 
						|
 | 
						|
static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
 | 
						|
{
 | 
						|
    AVFilterContext *ctx = inlink->dst;
 | 
						|
    ASNSContext *asns = ctx->priv;
 | 
						|
    AVFilterLink *outlink = ctx->outputs[0];
 | 
						|
    int ret;
 | 
						|
    int nb_samples = insamples->nb_samples;
 | 
						|
 | 
						|
    if (av_audio_fifo_space(asns->fifo) < nb_samples) {
 | 
						|
        av_log(ctx, AV_LOG_DEBUG, "No space for %d samples, stretching audio fifo\n", nb_samples);
 | 
						|
        ret = av_audio_fifo_realloc(asns->fifo, av_audio_fifo_size(asns->fifo) + nb_samples);
 | 
						|
        if (ret < 0) {
 | 
						|
            av_log(ctx, AV_LOG_ERROR,
 | 
						|
                   "Stretching audio fifo failed, discarded %d samples\n", nb_samples);
 | 
						|
            return -1;
 | 
						|
        }
 | 
						|
    }
 | 
						|
    av_audio_fifo_write(asns->fifo, (void **)insamples->extended_data, nb_samples);
 | 
						|
    if (asns->next_out_pts == AV_NOPTS_VALUE)
 | 
						|
        asns->next_out_pts = insamples->pts;
 | 
						|
    av_frame_free(&insamples);
 | 
						|
 | 
						|
    while (av_audio_fifo_size(asns->fifo) >= asns->nb_out_samples)
 | 
						|
        push_samples(outlink);
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int request_frame(AVFilterLink *outlink)
 | 
						|
{
 | 
						|
    ASNSContext *asns = outlink->src->priv;
 | 
						|
    AVFilterLink *inlink = outlink->src->inputs[0];
 | 
						|
    int ret;
 | 
						|
 | 
						|
    asns->req_fullfilled = 0;
 | 
						|
    do {
 | 
						|
        ret = ff_request_frame(inlink);
 | 
						|
    } while (!asns->req_fullfilled && ret >= 0);
 | 
						|
 | 
						|
    if (ret == AVERROR_EOF)
 | 
						|
        while (push_samples(outlink))
 | 
						|
            ;
 | 
						|
 | 
						|
    return ret;
 | 
						|
}
 | 
						|
 | 
						|
static const AVFilterPad asetnsamples_inputs[] = {
 | 
						|
    {
 | 
						|
        .name           = "default",
 | 
						|
        .type           = AVMEDIA_TYPE_AUDIO,
 | 
						|
        .filter_frame   = filter_frame,
 | 
						|
        .needs_writable = 1,
 | 
						|
    },
 | 
						|
    {  NULL }
 | 
						|
};
 | 
						|
 | 
						|
static const AVFilterPad asetnsamples_outputs[] = {
 | 
						|
    {
 | 
						|
        .name          = "default",
 | 
						|
        .type          = AVMEDIA_TYPE_AUDIO,
 | 
						|
        .request_frame = request_frame,
 | 
						|
        .config_props  = config_props_output,
 | 
						|
    },
 | 
						|
    { NULL }
 | 
						|
};
 | 
						|
 | 
						|
AVFilter avfilter_af_asetnsamples = {
 | 
						|
    .name           = "asetnsamples",
 | 
						|
    .description    = NULL_IF_CONFIG_SMALL("Set the number of samples for each output audio frames."),
 | 
						|
    .priv_size      = sizeof(ASNSContext),
 | 
						|
    .init           = init,
 | 
						|
    .uninit         = uninit,
 | 
						|
    .inputs         = asetnsamples_inputs,
 | 
						|
    .outputs        = asetnsamples_outputs,
 | 
						|
    .priv_class     = &asetnsamples_class,
 | 
						|
};
 |