* 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>
		
	
			
		
			
				
	
	
		
			132 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			132 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 2003 Rich Felker
 | 
						|
 * 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
 | 
						|
 * field filter, based on libmpcodecs/vf_field.c by Rich Felker
 | 
						|
 */
 | 
						|
 | 
						|
#include "libavutil/opt.h"
 | 
						|
#include "libavutil/pixdesc.h"
 | 
						|
#include "avfilter.h"
 | 
						|
#include "internal.h"
 | 
						|
 | 
						|
enum FieldType { FIELD_TYPE_TOP = 0, FIELD_TYPE_BOTTOM };
 | 
						|
 | 
						|
typedef struct {
 | 
						|
    const AVClass *class;
 | 
						|
    enum FieldType type;
 | 
						|
    int nb_planes;              ///< number of planes of the current format
 | 
						|
} FieldContext;
 | 
						|
 | 
						|
#define OFFSET(x) offsetof(FieldContext, x)
 | 
						|
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
 | 
						|
 | 
						|
static const AVOption field_options[] = {
 | 
						|
    {"type", "set field type (top or bottom)", OFFSET(type), AV_OPT_TYPE_INT, {.i64=FIELD_TYPE_TOP}, 0, 1, FLAGS, "field_type" },
 | 
						|
    {"top",    "select top field",    0, AV_OPT_TYPE_CONST, {.i64=FIELD_TYPE_TOP},    INT_MIN, INT_MAX, FLAGS, "field_type"},
 | 
						|
    {"bottom", "select bottom field", 0, AV_OPT_TYPE_CONST, {.i64=FIELD_TYPE_BOTTOM}, INT_MIN, INT_MAX, FLAGS, "field_type"},
 | 
						|
 | 
						|
    {NULL}
 | 
						|
};
 | 
						|
 | 
						|
AVFILTER_DEFINE_CLASS(field);
 | 
						|
 | 
						|
static av_cold int init(AVFilterContext *ctx, const char *args)
 | 
						|
{
 | 
						|
    FieldContext *field = ctx->priv;
 | 
						|
    static const char *shorthand[] = { "type", NULL };
 | 
						|
 | 
						|
    field->class = &field_class;
 | 
						|
    av_opt_set_defaults(field);
 | 
						|
 | 
						|
    return av_opt_set_from_string(field, args, shorthand, "=", ":");
 | 
						|
}
 | 
						|
 | 
						|
static int config_props_output(AVFilterLink *outlink)
 | 
						|
{
 | 
						|
    AVFilterContext *ctx = outlink->src;
 | 
						|
    FieldContext *field = ctx->priv;
 | 
						|
    AVFilterLink *inlink = ctx->inputs[0];
 | 
						|
    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
 | 
						|
    int i;
 | 
						|
 | 
						|
    for (i = 0; i < desc->nb_components; i++)
 | 
						|
        field->nb_planes = FFMAX(field->nb_planes, desc->comp[i].plane);
 | 
						|
    field->nb_planes++;
 | 
						|
 | 
						|
    outlink->w = inlink->w;
 | 
						|
    outlink->h = (inlink->h + (field->type == FIELD_TYPE_TOP)) / 2;
 | 
						|
 | 
						|
    av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d type:%s -> w:%d h:%d\n",
 | 
						|
           inlink->w, inlink->h, field->type == FIELD_TYPE_BOTTOM ? "bottom" : "top",
 | 
						|
           outlink->w, outlink->h);
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref)
 | 
						|
{
 | 
						|
    FieldContext *field = inlink->dst->priv;
 | 
						|
    AVFilterLink *outlink = inlink->dst->outputs[0];
 | 
						|
    int i;
 | 
						|
 | 
						|
    inpicref->height = outlink->h;
 | 
						|
    inpicref->interlaced_frame = 0;
 | 
						|
 | 
						|
    for (i = 0; i < field->nb_planes; i++) {
 | 
						|
        if (field->type == FIELD_TYPE_BOTTOM)
 | 
						|
            inpicref->data[i] = inpicref->data[i] + inpicref->linesize[i];
 | 
						|
        inpicref->linesize[i] = 2 * inpicref->linesize[i];
 | 
						|
    }
 | 
						|
    return ff_filter_frame(outlink, inpicref);
 | 
						|
}
 | 
						|
 | 
						|
static const AVFilterPad field_inputs[] = {
 | 
						|
    {
 | 
						|
        .name             = "default",
 | 
						|
        .type             = AVMEDIA_TYPE_VIDEO,
 | 
						|
        .get_video_buffer = ff_null_get_video_buffer,
 | 
						|
        .filter_frame     = filter_frame,
 | 
						|
    },
 | 
						|
    { NULL }
 | 
						|
};
 | 
						|
 | 
						|
static const AVFilterPad field_outputs[] = {
 | 
						|
    {
 | 
						|
        .name          = "default",
 | 
						|
        .type          = AVMEDIA_TYPE_VIDEO,
 | 
						|
        .config_props  = config_props_output,
 | 
						|
    },
 | 
						|
    { NULL }
 | 
						|
};
 | 
						|
 | 
						|
AVFilter avfilter_vf_field = {
 | 
						|
    .name          = "field",
 | 
						|
    .description   = NULL_IF_CONFIG_SMALL("Extract a field from the input video."),
 | 
						|
 | 
						|
    .priv_size     = sizeof(FieldContext),
 | 
						|
    .init          = init,
 | 
						|
 | 
						|
    .inputs        = field_inputs,
 | 
						|
    .outputs       = field_outputs,
 | 
						|
    .priv_class    = &field_class,
 | 
						|
};
 |