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
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>
128 lines
3.9 KiB
C
128 lines
3.9 KiB
C
/*
|
|
*
|
|
* This file is part of Libav.
|
|
*
|
|
* Libav 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.
|
|
*
|
|
* Libav 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 Libav; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVFILTER_BUFFERSRC_H
|
|
#define AVFILTER_BUFFERSRC_H
|
|
|
|
/**
|
|
* @file
|
|
* Memory buffer source API.
|
|
*/
|
|
|
|
#include "libavcodec/avcodec.h"
|
|
#include "avfilter.h"
|
|
|
|
enum {
|
|
|
|
/**
|
|
* Do not check for format changes.
|
|
*/
|
|
AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT = 1,
|
|
|
|
/**
|
|
* Do not copy buffer data.
|
|
*/
|
|
AV_BUFFERSRC_FLAG_NO_COPY = 2,
|
|
|
|
/**
|
|
* Immediately push the frame to the output.
|
|
*/
|
|
AV_BUFFERSRC_FLAG_PUSH = 4,
|
|
|
|
};
|
|
|
|
/**
|
|
* Add buffer data in picref to buffer_src.
|
|
*
|
|
* @param buffer_src pointer to a buffer source context
|
|
* @param picref a buffer reference, or NULL to mark EOF
|
|
* @param flags a combination of AV_BUFFERSRC_FLAG_*
|
|
* @return >= 0 in case of success, a negative AVERROR code
|
|
* in case of failure
|
|
*/
|
|
int av_buffersrc_add_ref(AVFilterContext *buffer_src,
|
|
AVFilterBufferRef *picref, int flags);
|
|
|
|
/**
|
|
* Get the number of failed requests.
|
|
*
|
|
* A failed request is when the request_frame method is called while no
|
|
* frame is present in the buffer.
|
|
* The number is reset when a frame is added.
|
|
*/
|
|
unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src);
|
|
|
|
#if FF_API_AVFILTERBUFFER
|
|
/**
|
|
* Add a buffer to the filtergraph s.
|
|
*
|
|
* @param buf buffer containing frame data to be passed down the filtergraph.
|
|
* This function will take ownership of buf, the user must not free it.
|
|
* A NULL buf signals EOF -- i.e. no more frames will be sent to this filter.
|
|
*
|
|
* @deprecated use av_buffersrc_write_frame() or av_buffersrc_add_frame()
|
|
*/
|
|
attribute_deprecated
|
|
int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf);
|
|
#endif
|
|
|
|
/**
|
|
* Add a frame to the buffer source.
|
|
*
|
|
* @param s an instance of the buffersrc filter.
|
|
* @param frame frame to be added. If the frame is reference counted, this
|
|
* function will make a new reference to it. Otherwise the frame data will be
|
|
* copied.
|
|
*
|
|
* @return 0 on success, a negative AVERROR on error
|
|
*/
|
|
int av_buffersrc_write_frame(AVFilterContext *s, const AVFrame *frame);
|
|
|
|
/**
|
|
* Add a frame to the buffer source.
|
|
*
|
|
* @param s an instance of the buffersrc filter.
|
|
* @param frame frame to be added. If the frame is reference counted, this
|
|
* function will take ownership of the reference(s) and reset the frame.
|
|
* Otherwise the frame data will be copied. If this function returns an error,
|
|
* the input frame is not touched.
|
|
*
|
|
* @return 0 on success, a negative AVERROR on error.
|
|
*
|
|
* @note the difference between this function and av_buffersrc_write_frame() is
|
|
* that av_buffersrc_write_frame() creates a new reference to the input frame,
|
|
* while this function takes ownership of the reference passed to it.
|
|
*/
|
|
int av_buffersrc_add_frame(AVFilterContext *ctx, AVFrame *frame);
|
|
|
|
/**
|
|
* Add frame data to buffer_src. XXX
|
|
*
|
|
* @param buffer_src pointer to a buffer source context
|
|
* @param frame a frame, or NULL to mark EOF
|
|
* @param flags a combination of AV_BUFFERSRC_FLAG_*
|
|
* @return >= 0 in case of success, a negative AVERROR code
|
|
* in case of failure
|
|
*/
|
|
int av_buffersrc_add_frame_flags(AVFilterContext *buffer_src,
|
|
AVFrame *frame, int flags);
|
|
|
|
|
|
#endif /* AVFILTER_BUFFERSRC_H */
|