mirror of https://github.com/FFmpeg/FFmpeg.git
* 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>
pull/12/merge
Michael Niedermayer
12 years ago
commit
a05a44e205
124 changed files with 1820 additions and 1926 deletions
@ -1,123 +0,0 @@ |
||||
/*
|
||||
* Copyright (c) 2008 Vitor Sessak |
||||
* Copyright (c) 2010 S.N. Hemanth Meenakshisundaram |
||||
* Copyright (c) 2011 Mina Nagy Zaki |
||||
* |
||||
* 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 |
||||
* memory buffer source filter |
||||
*/ |
||||
|
||||
#include "avfilter.h" |
||||
#include "internal.h" |
||||
#include "audio.h" |
||||
#include "avcodec.h" |
||||
#include "buffersrc.h" |
||||
#include "asrc_abuffer.h" |
||||
#include "libavutil/avstring.h" |
||||
#include "libavutil/channel_layout.h" |
||||
#include "libavutil/fifo.h" |
||||
#include "libavutil/imgutils.h" |
||||
|
||||
typedef struct { |
||||
AVFifoBuffer *fifo; |
||||
AVRational time_base; ///< time_base to set in the output link
|
||||
int eof; |
||||
unsigned nb_failed_requests; |
||||
|
||||
/* Video only */ |
||||
AVFilterContext *scale; |
||||
int h, w; |
||||
enum AVPixelFormat pix_fmt; |
||||
AVRational sample_aspect_ratio; |
||||
char sws_param[256]; |
||||
|
||||
/* Audio only */ |
||||
// Audio format of incoming buffers
|
||||
int sample_rate; |
||||
unsigned int sample_format; |
||||
int64_t channel_layout; |
||||
|
||||
// Normalization filters
|
||||
AVFilterContext *aconvert; |
||||
AVFilterContext *aresample; |
||||
} BufferSourceContext; |
||||
|
||||
static void buf_free(AVFilterBuffer *ptr) |
||||
{ |
||||
av_free(ptr); |
||||
return; |
||||
} |
||||
|
||||
int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *ctx, |
||||
AVFilterBufferRef *samplesref, |
||||
int av_unused flags) |
||||
{ |
||||
return av_buffersrc_add_ref(ctx, samplesref, AV_BUFFERSRC_FLAG_NO_COPY); |
||||
} |
||||
|
||||
int av_asrc_buffer_add_samples(AVFilterContext *ctx, |
||||
uint8_t *data[8], int linesize[8], |
||||
int nb_samples, int sample_rate, |
||||
int sample_fmt, int64_t channel_layout, int planar, |
||||
int64_t pts, int av_unused flags) |
||||
{ |
||||
AVFilterBufferRef *samplesref; |
||||
|
||||
if (!channel_layout) |
||||
return AVERROR(EINVAL); |
||||
samplesref = avfilter_get_audio_buffer_ref_from_arrays( |
||||
data, linesize[0], AV_PERM_WRITE, |
||||
nb_samples, |
||||
sample_fmt, channel_layout); |
||||
if (!samplesref) |
||||
return AVERROR(ENOMEM); |
||||
|
||||
samplesref->buf->free = buf_free; |
||||
samplesref->pts = pts; |
||||
samplesref->audio->sample_rate = sample_rate; |
||||
|
||||
AV_NOWARN_DEPRECATED( |
||||
return av_asrc_buffer_add_audio_buffer_ref(ctx, samplesref, 0); |
||||
) |
||||
} |
||||
|
||||
int av_asrc_buffer_add_buffer(AVFilterContext *ctx, |
||||
uint8_t *buf, int buf_size, int sample_rate, |
||||
int sample_fmt, int64_t channel_layout, int planar, |
||||
int64_t pts, int av_unused flags) |
||||
{ |
||||
uint8_t *data[8] = {0}; |
||||
int linesize[8]; |
||||
int nb_channels = av_get_channel_layout_nb_channels(channel_layout), |
||||
nb_samples = buf_size / nb_channels / av_get_bytes_per_sample(sample_fmt); |
||||
|
||||
av_samples_fill_arrays(data, linesize, |
||||
buf, nb_channels, nb_samples, |
||||
sample_fmt, 16); |
||||
|
||||
AV_NOWARN_DEPRECATED( |
||||
return av_asrc_buffer_add_samples(ctx, |
||||
data, linesize, nb_samples, |
||||
sample_rate, |
||||
sample_fmt, channel_layout, planar, |
||||
pts, flags); |
||||
) |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue