RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avilter/avf_showwaves: switch to activate in showwaves filter

This commit is contained in:
Paul B Mahol 2019-05-30 20:31:03 +02:00
parent ff2a638c83
commit d3f236b300
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavfilter/avf_showwaves.c
View File

@ -29,6 +29,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "avfilter.h" #include "avfilter.h"
#include "filters.h"
#include "formats.h" #include "formats.h"
#include "audio.h" #include "audio.h"
#include "video.h" #include "video.h"
@ -706,7 +707,8 @@ static int showwaves_filter_frame(AVFilterLink *inlink, AVFrame *insamples)
showwaves->sample_count_mod = 0; showwaves->sample_count_mod = 0;
showwaves->buf_idx++; showwaves->buf_idx++;
} }
if (showwaves->buf_idx == showwaves->w) if (showwaves->buf_idx == showwaves->w ||
(ff_outlink_get_status(inlink) && i == nb_samples - 1))
if ((ret = push_frame(outlink)) < 0) if ((ret = push_frame(outlink)) < 0)
break; break;
outpicref = showwaves->outpicref; outpicref = showwaves->outpicref;
@ -717,11 +719,33 @@ end:
return ret; return ret;
} }
static int activate(AVFilterContext *ctx)
{
AVFilterLink *inlink = ctx->inputs[0];
AVFilterLink *outlink = ctx->outputs[0];
ShowWavesContext *showwaves = ctx->priv;
AVFrame *in;
const int nb_samples = showwaves->n * outlink->w;
int ret;
FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
ret = ff_inlink_consume_samples(inlink, nb_samples, nb_samples, &in);
if (ret < 0)
return ret;
if (ret > 0)
return showwaves_filter_frame(inlink, in);
FF_FILTER_FORWARD_STATUS(inlink, outlink);
FF_FILTER_FORWARD_WANTED(outlink, inlink);
return FFERROR_NOT_READY;
}
static const AVFilterPad showwaves_inputs[] = { static const AVFilterPad showwaves_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.filter_frame = showwaves_filter_frame,
}, },
{ NULL } { NULL }
}; };
@ -731,7 +755,6 @@ static const AVFilterPad showwaves_outputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output, .config_props = config_output,
.request_frame = request_frame,
}, },
{ NULL } { NULL }
}; };
@ -744,6 +767,7 @@ AVFilter ff_avf_showwaves = {
.query_formats = query_formats, .query_formats = query_formats,
.priv_size = sizeof(ShowWavesContext), .priv_size = sizeof(ShowWavesContext),
.inputs = showwaves_inputs, .inputs = showwaves_inputs,
.activate = activate,
.outputs = showwaves_outputs, .outputs = showwaves_outputs,
.priv_class = &showwaves_class, .priv_class = &showwaves_class,
}; };