History

avfilter/avf_showfreqs: switch to activate

Paul B Mahol committed 7 years ago

Commit fc0de1c1 parent a9fa6b81 file · +48 −26Browse files

Unified · Split

libavfilter/avf_showfreqs.c+48−26
@@ -30,6 +30,7 @@ · 29 unmodified lines
30#include "libavutil/opt.h"30#include "libavutil/opt.h"
31#include "libavutil/parseutils.h"31#include "libavutil/parseutils.h"
32#include "audio.h"32#include "audio.h"
33#include "filters.h"
33#include "video.h"34#include "video.h"
34#include "avfilter.h"35#include "avfilter.h"
35#include "internal.h"36#include "internal.h"
@@ -439,45 +440,66 @@ static int plot_freqs(AVFilterLink *inlink, AVFrame *in) · 403 unmodified lines
439 return ff_filter_frame(outlink, out);440 return ff_filter_frame(outlink, out);
440}441}
441 442
442static int filter_frame(AVFilterLink *inlink, AVFrame *in)443static int filter_frame(AVFilterLink *inlink)
443{444{
444 AVFilterContext *ctx = inlink->dst;445 AVFilterContext *ctx = inlink->dst;
445 ShowFreqsContext *s = ctx->priv;446 ShowFreqsContext *s = ctx->priv;
446 AVFrame *fin = NULL;447 AVFrame *fin = NULL;
447 int consumed = 0;
448 int ret = 0;448 int ret = 0;
449 449
450 if (s->pts == AV_NOPTS_VALUE)450 fin = ff_get_audio_buffer(inlink, s->win_size);
451 s->pts = in->pts - av_audio_fifo_size(s->fifo);451 if (!fin) {
452 ret = AVERROR(ENOMEM);
453 goto fail;
454 }
452 455
453 av_audio_fifo_write(s->fifo, (void **)in->extended_data, in->nb_samples);456 fin->pts = s->pts;
454 while (av_audio_fifo_size(s->fifo) >= s->win_size) {457 s->pts += s->hop_size;
455 fin = ff_get_audio_buffer(inlink, s->win_size);458 ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, s->win_size);
456 if (!fin) {459 if (ret < 0)
457 ret = AVERROR(ENOMEM);460 goto fail;
458 goto fail;
459 }
460 461
461 fin->pts = s->pts + consumed;462 ret = plot_freqs(inlink, fin);
462 consumed += s->hop_size;463 av_frame_free(&fin);
463 ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, s->win_size);464 av_audio_fifo_drain(s->fifo, s->hop_size);
464 if (ret < 0)
465 goto fail;
466
467 ret = plot_freqs(inlink, fin);
468 av_frame_free(&fin);
469 av_audio_fifo_drain(s->fifo, s->hop_size);
470 if (ret < 0)
471 goto fail;
472 }
473 465
474fail:466fail:
475 s->pts = AV_NOPTS_VALUE;
476 av_frame_free(&fin);467 av_frame_free(&fin);
477 av_frame_free(&in);
478 return ret;468 return ret;
479}469}
480 470
471static int activate(AVFilterContext *ctx)
472{
473 AVFilterLink *inlink = ctx->inputs[0];
474 AVFilterLink *outlink = ctx->outputs[0];
475 ShowFreqsContext *s = ctx->priv;
476 AVFrame *in = NULL;
477 int ret = 0;
478
479 FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
480
481 if (av_audio_fifo_size(s->fifo) < s->win_size)
482 ret = ff_inlink_consume_samples(inlink, s->win_size, s->win_size, &in);
483 if (ret < 0)
484 return ret;
485 if (ret > 0) {
486 av_audio_fifo_write(s->fifo, (void **)in->extended_data, in->nb_samples);
487 if (s->pts == AV_NOPTS_VALUE)
488 s->pts = in->pts;
489 }
490
491 if (av_audio_fifo_size(s->fifo) >= s->win_size) {
492 ret = filter_frame(inlink);
493 if (ret <= 0)
494 return ret;
495 }
496
497 FF_FILTER_FORWARD_STATUS(inlink, outlink);
498 FF_FILTER_FORWARD_WANTED(outlink, inlink);
499
500 return FFERROR_NOT_READY;
501}
502
481static av_cold void uninit(AVFilterContext *ctx)503static av_cold void uninit(AVFilterContext *ctx)
482{504{
483 ShowFreqsContext *s = ctx->priv;505 ShowFreqsContext *s = ctx->priv;
@@ -500,7 +522,6 @@ static const AVFilterPad showfreqs_inputs[] = { · 16 unmodified lines
500 {522 {
501 .name = "default",523 .name = "default",
502 .type = AVMEDIA_TYPE_AUDIO,524 .type = AVMEDIA_TYPE_AUDIO,
503 .filter_frame = filter_frame,
504 },525 },
505 { NULL }526 { NULL }
506};527};
@@ -521,6 +542,7 @@ AVFilter ff_avf_showfreqs = { · 14 unmodified lines
521 .uninit = uninit,542 .uninit = uninit,
522 .query_formats = query_formats,543 .query_formats = query_formats,
523 .priv_size = sizeof(ShowFreqsContext),544 .priv_size = sizeof(ShowFreqsContext),
545 .activate = activate,
524 .inputs = showfreqs_inputs,546 .inputs = showfreqs_inputs,
525 .outputs = showfreqs_outputs,547 .outputs = showfreqs_outputs,
526 .priv_class = &showfreqs_class,548 .priv_class = &showfreqs_class,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t