mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +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
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>
77 lines
2.4 KiB
C
77 lines
2.4 KiB
C
/*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU 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.
|
|
*/
|
|
|
|
#ifndef AVFILTER_YADIF_H
|
|
#define AVFILTER_YADIF_H
|
|
|
|
#include "libavutil/pixdesc.h"
|
|
#include "avfilter.h"
|
|
|
|
enum YADIFMode {
|
|
YADIF_MODE_SEND_FRAME = 0, ///< send 1 frame for each frame
|
|
YADIF_MODE_SEND_FIELD = 1, ///< send 1 frame for each field
|
|
YADIF_MODE_SEND_FRAME_NOSPATIAL = 2, ///< send 1 frame for each frame but skips spatial interlacing check
|
|
YADIF_MODE_SEND_FIELD_NOSPATIAL = 3, ///< send 1 frame for each field but skips spatial interlacing check
|
|
};
|
|
|
|
enum YADIFParity {
|
|
YADIF_PARITY_TFF = 0, ///< top field first
|
|
YADIF_PARITY_BFF = 1, ///< bottom field first
|
|
YADIF_PARITY_AUTO = -1, ///< auto detection
|
|
};
|
|
|
|
enum YADIFDeint {
|
|
YADIF_DEINT_ALL = 0, ///< deinterlace all frames
|
|
YADIF_DEINT_INTERLACED = 1, ///< only deinterlace frames marked as interlaced
|
|
};
|
|
|
|
typedef struct YADIFContext {
|
|
const AVClass *class;
|
|
|
|
enum YADIFMode mode;
|
|
enum YADIFParity parity;
|
|
enum YADIFDeint deint;
|
|
|
|
int frame_pending;
|
|
|
|
AVFrame *cur;
|
|
AVFrame *next;
|
|
AVFrame *prev;
|
|
AVFrame *out;
|
|
|
|
/**
|
|
* Required alignment for filter_line
|
|
*/
|
|
int req_align;
|
|
void (*filter_line)(void *dst,
|
|
void *prev, void *cur, void *next,
|
|
int w, int prefs, int mrefs, int parity, int mode);
|
|
void (*filter_edges)(void *dst, void *prev, void *cur, void *next,
|
|
int w, int prefs, int mrefs, int parity, int mode,
|
|
int l_edge);
|
|
|
|
const AVPixFmtDescriptor *csp;
|
|
int eof;
|
|
uint8_t *temp_line;
|
|
int temp_line_size;
|
|
} YADIFContext;
|
|
|
|
void ff_yadif_init_x86(YADIFContext *yadif);
|
|
|
|
#endif /* AVFILTER_YADIF_H */
|