highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/aevalsrc: switch to activate

Browse Source 
Allow to set the EOF timestamp.

FATE test is updated, as last 2 frames were duplicated.
This commit is contained in:
Paul B Mahol 2021-08-21 16:37:20 +02:00
parent 6854cc2ec7
commit 99ccad843f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/aeval.c
View File

@ -30,6 +30,7 @@
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "avfilter.h" #include "avfilter.h"
#include "audio.h" #include "audio.h"
#include "filters.h"
#include "internal.h" #include "internal.h"
static const char * const var_names[] = { static const char * const var_names[] = {
@ -259,21 +260,27 @@ static int query_formats(AVFilterContext *ctx)
return ff_set_common_samplerates_from_list(ctx, sample_rates); return ff_set_common_samplerates_from_list(ctx, sample_rates);
} }
static int request_frame(AVFilterLink *outlink) static int activate(AVFilterContext *ctx)
{ {
AVFilterLink *outlink = ctx->outputs[0];
EvalContext *eval = outlink->src->priv; EvalContext *eval = outlink->src->priv;
AVFrame *samplesref; AVFrame *samplesref;
int i, j; int i, j;
int64_t t = av_rescale(eval->n, AV_TIME_BASE, eval->sample_rate); int64_t t = av_rescale(eval->n, AV_TIME_BASE, eval->sample_rate);
int nb_samples; int nb_samples;
if (!ff_outlink_frame_wanted(outlink))
return FFERROR_NOT_READY;
if (eval->duration >= 0 && t >= eval->duration) if (eval->duration >= 0 && t >= eval->duration)
return AVERROR_EOF; return AVERROR_EOF;
if (eval->duration >= 0) { if (eval->duration >= 0) {
nb_samples = FFMIN(eval->nb_samples, av_rescale(eval->duration, eval->sample_rate, AV_TIME_BASE) - eval->pts); nb_samples = FFMIN(eval->nb_samples, av_rescale(eval->duration, eval->sample_rate, AV_TIME_BASE) - eval->pts);
if (!nb_samples) if (!nb_samples) {
return AVERROR_EOF; ff_outlink_set_status(outlink, AVERROR_EOF, eval->pts);
return 0;
}
} else { } else {
nb_samples = eval->nb_samples; nb_samples = eval->nb_samples;
} }
@ -305,7 +312,6 @@ static const AVFilterPad aevalsrc_outputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.config_props = config_props, .config_props = config_props,
.request_frame = request_frame,
}, },
}; };
@ -315,6 +321,7 @@ const AVFilter ff_asrc_aevalsrc = {
.query_formats = query_formats, .query_formats = query_formats,
.init = init, .init = init,
.uninit = uninit, .uninit = uninit,
.activate = activate,
.priv_size = sizeof(EvalContext), .priv_size = sizeof(EvalContext),
.inputs = NULL, .inputs = NULL,
FILTER_OUTPUTS(aevalsrc_outputs), FILTER_OUTPUTS(aevalsrc_outputs),

2
tests/ref/fate/ffmpeg-filter_complex_audio
View File

@ -6,5 +6,3 @@
#channel_layout_name 0: mono #channel_layout_name 0: mono
0, -256, -256, 1536, 416, 0x3001fb2d 0, -256, -256, 1536, 416, 0x3001fb2d
0, 1280, 1280, 1536, 418, 0xba72fc16 0, 1280, 1280, 1536, 418, 0xba72fc16
0, 2816, 2816, 1536, 418, 0xba72fc16
0, 4352, 4352, 1536, 418, 0xba72fc16