mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-18 22:55:12 +08:00
Merge commit '7e350379f87e7f74420b4813170fe808e2313911'
* 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>
This commit is contained in:
Michael Niedermayer
@@ -157,7 +157,7 @@ static int config_output(AVFilterLink *outlink)
|
||||
}
|
||||
|
||||
static void push_frame(AVFilterContext *ctx, unsigned in_no,
|
||||
AVFilterBufferRef *buf)
|
||||
AVFrame *buf)
|
||||
{
|
||||
ConcatContext *cat = ctx->priv;
|
||||
unsigned out_no = in_no % ctx->nb_outputs;
|
||||
@@ -171,7 +171,7 @@ static void push_frame(AVFilterContext *ctx, unsigned in_no,
|
||||
/* add duration to input PTS */
|
||||
if (inlink->sample_rate)
|
||||
/* use number of audio samples */
|
||||
in->pts += av_rescale_q(buf->audio->nb_samples,
|
||||
in->pts += av_rescale_q(buf->nb_samples,
|
||||
(AVRational){ 1, inlink->sample_rate },
|
||||
outlink->time_base);
|
||||
else if (in->nb_frames >= 2)
|
||||
@@ -182,7 +182,7 @@ static void push_frame(AVFilterContext *ctx, unsigned in_no,
|
||||
ff_filter_frame(outlink, buf);
|
||||
}
|
||||
|
||||
static void process_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
|
||||
static void process_frame(AVFilterLink *inlink, AVFrame *buf)
|
||||
{
|
||||
AVFilterContext *ctx = inlink->dst;
|
||||
ConcatContext *cat = ctx->priv;
|
||||
@@ -191,7 +191,7 @@ static void process_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
|
||||
if (in_no < cat->cur_idx) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Frame after EOF on input %s\n",
|
||||
ctx->input_pads[in_no].name);
|
||||
avfilter_unref_buffer(buf);
|
||||
av_frame_free(&buf);
|
||||
} else if (in_no >= cat->cur_idx + ctx->nb_outputs) {
|
||||
ff_bufqueue_add(ctx, &cat->in[in_no].queue, buf);
|
||||
} else {
|
||||
@@ -199,27 +199,25 @@ static void process_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
|
||||
}
|
||||
}
|
||||
|
||||
static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms,
|
||||
int w, int h)
|
||||
static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h)
|
||||
{
|
||||
AVFilterContext *ctx = inlink->dst;
|
||||
unsigned in_no = FF_INLINK_IDX(inlink);
|
||||
AVFilterLink *outlink = ctx->outputs[in_no % ctx->nb_outputs];
|
||||
|
||||
return ff_get_video_buffer(outlink, perms, w, h);
|
||||
return ff_get_video_buffer(outlink, w, h);
|
||||
}
|
||||
|
||||
static AVFilterBufferRef *get_audio_buffer(AVFilterLink *inlink, int perms,
|
||||
int nb_samples)
|
||||
static AVFrame *get_audio_buffer(AVFilterLink *inlink, int nb_samples)
|
||||
{
|
||||
AVFilterContext *ctx = inlink->dst;
|
||||
unsigned in_no = FF_INLINK_IDX(inlink);
|
||||
AVFilterLink *outlink = ctx->outputs[in_no % ctx->nb_outputs];
|
||||
|
||||
return ff_get_audio_buffer(outlink, perms, nb_samples);
|
||||
return ff_get_audio_buffer(outlink, nb_samples);
|
||||
}
|
||||
|
||||
static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
|
||||
static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
|
||||
{
|
||||
process_frame(inlink, buf);
|
||||
return 0; /* enhancement: handle error return */
|
||||
@@ -256,7 +254,7 @@ static void send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no)
|
||||
int64_t nb_samples, sent = 0;
|
||||
int frame_nb_samples;
|
||||
AVRational rate_tb = { 1, ctx->inputs[in_no]->sample_rate };
|
||||
AVFilterBufferRef *buf;
|
||||
AVFrame *buf;
|
||||
int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout);
|
||||
|
||||
if (!rate_tb.den)
|
||||
@@ -266,7 +264,7 @@ static void send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no)
|
||||
frame_nb_samples = FFMAX(9600, rate_tb.den / 5); /* arbitrary */
|
||||
while (nb_samples) {
|
||||
frame_nb_samples = FFMIN(frame_nb_samples, nb_samples);
|
||||
buf = ff_get_audio_buffer(outlink, AV_PERM_WRITE, frame_nb_samples);
|
||||
buf = ff_get_audio_buffer(outlink, frame_nb_samples);
|
||||
if (!buf)
|
||||
return;
|
||||
av_samples_set_silence(buf->extended_data, 0, frame_nb_samples,
|
||||
@@ -360,7 +358,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
|
||||
for (str = 0; str < cat->nb_streams[type]; str++) {
|
||||
AVFilterPad pad = {
|
||||
.type = type,
|
||||
.min_perms = AV_PERM_READ | AV_PERM_PRESERVE,
|
||||
.get_video_buffer = get_video_buffer,
|
||||
.get_audio_buffer = get_audio_buffer,
|
||||
.filter_frame = filter_frame,
|
||||
|
||||
Reference in New Issue
Block a user