* 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>
		
	
		
			
				
	
	
		
			116 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			116 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * 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
 | 
						|
 * set field order
 | 
						|
 */
 | 
						|
 | 
						|
#include "libavutil/opt.h"
 | 
						|
#include "avfilter.h"
 | 
						|
#include "internal.h"
 | 
						|
#include "video.h"
 | 
						|
 | 
						|
enum SetFieldMode {
 | 
						|
    MODE_AUTO = -1,
 | 
						|
    MODE_BFF,
 | 
						|
    MODE_TFF,
 | 
						|
    MODE_PROG,
 | 
						|
};
 | 
						|
 | 
						|
typedef struct {
 | 
						|
    const AVClass *class;
 | 
						|
    enum SetFieldMode mode;
 | 
						|
} SetFieldContext;
 | 
						|
 | 
						|
#define OFFSET(x) offsetof(SetFieldContext, x)
 | 
						|
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
 | 
						|
 | 
						|
static const AVOption setfield_options[] = {
 | 
						|
    {"mode", "select interlace mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=MODE_AUTO}, -1, MODE_PROG, FLAGS, "mode"},
 | 
						|
    {"auto", "keep the same input field",  0, AV_OPT_TYPE_CONST, {.i64=MODE_AUTO}, INT_MIN, INT_MAX, FLAGS, "mode"},
 | 
						|
    {"bff",  "mark as bottom-field-first", 0, AV_OPT_TYPE_CONST, {.i64=MODE_BFF},  INT_MIN, INT_MAX, FLAGS, "mode"},
 | 
						|
    {"tff",  "mark as top-field-first",    0, AV_OPT_TYPE_CONST, {.i64=MODE_TFF},  INT_MIN, INT_MAX, FLAGS, "mode"},
 | 
						|
    {"prog", "mark as progressive",        0, AV_OPT_TYPE_CONST, {.i64=MODE_PROG}, INT_MIN, INT_MAX, FLAGS, "mode"},
 | 
						|
    {NULL}
 | 
						|
};
 | 
						|
 | 
						|
AVFILTER_DEFINE_CLASS(setfield);
 | 
						|
 | 
						|
static av_cold int init(AVFilterContext *ctx, const char *args)
 | 
						|
{
 | 
						|
    SetFieldContext *setfield = ctx->priv;
 | 
						|
    static const char *shorthand[] = { "mode", NULL };
 | 
						|
 | 
						|
    setfield->class = &setfield_class;
 | 
						|
    av_opt_set_defaults(setfield);
 | 
						|
 | 
						|
    return av_opt_set_from_string(setfield, args, shorthand, "=", ":");
 | 
						|
}
 | 
						|
 | 
						|
static av_cold void uninit(AVFilterContext *ctx)
 | 
						|
{
 | 
						|
    SetFieldContext *setfield = ctx->priv;
 | 
						|
    av_opt_free(setfield);
 | 
						|
}
 | 
						|
 | 
						|
static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
 | 
						|
{
 | 
						|
    SetFieldContext *setfield = inlink->dst->priv;
 | 
						|
 | 
						|
    if (setfield->mode == MODE_PROG) {
 | 
						|
        picref->interlaced_frame = 0;
 | 
						|
    } else if (setfield->mode != MODE_AUTO) {
 | 
						|
        picref->interlaced_frame = 1;
 | 
						|
        picref->top_field_first = setfield->mode;
 | 
						|
    }
 | 
						|
    return ff_filter_frame(inlink->dst->outputs[0], picref);
 | 
						|
}
 | 
						|
 | 
						|
static const AVFilterPad setfield_inputs[] = {
 | 
						|
    {
 | 
						|
        .name             = "default",
 | 
						|
        .type             = AVMEDIA_TYPE_VIDEO,
 | 
						|
        .get_video_buffer = ff_null_get_video_buffer,
 | 
						|
        .filter_frame     = filter_frame,
 | 
						|
    },
 | 
						|
    { NULL }
 | 
						|
};
 | 
						|
 | 
						|
static const AVFilterPad setfield_outputs[] = {
 | 
						|
    {
 | 
						|
        .name = "default",
 | 
						|
        .type = AVMEDIA_TYPE_VIDEO,
 | 
						|
    },
 | 
						|
    { NULL }
 | 
						|
};
 | 
						|
 | 
						|
AVFilter avfilter_vf_setfield = {
 | 
						|
    .name      = "setfield",
 | 
						|
    .description = NULL_IF_CONFIG_SMALL("Force field for the output video frame."),
 | 
						|
    .init      = init,
 | 
						|
    .uninit    = uninit,
 | 
						|
 | 
						|
    .priv_size = sizeof(SetFieldContext),
 | 
						|
    .inputs    = setfield_inputs,
 | 
						|
    .outputs   = setfield_outputs,
 | 
						|
    .priv_class = &setfield_class,
 | 
						|
};
 |