avfilter/f_graphmonitor: use sample_count_in/out

pull/364/head
Paul B Mahol 3 years ago
parent c317862c88
commit 9dbf95f209
  1. 6
      doc/filters.texi
  2. 14
      libavfilter/f_graphmonitor.c

@ -13020,6 +13020,12 @@ Display video frame rate or sample rate in case of audio used by filter link.
@item eof @item eof
Display link output status. Display link output status.
@item sample_count_in
Display number of samples taken from filter.
@item sample_count_out
Display number of samples given out from filter.
@end table @end table
@item rate, r @item rate, r

@ -62,6 +62,8 @@ enum {
MODE_SIZE = 1 << 7, MODE_SIZE = 1 << 7,
MODE_RATE = 1 << 8, MODE_RATE = 1 << 8,
MODE_EOF = 1 << 9, MODE_EOF = 1 << 9,
MODE_SCIN = 1 << 10,
MODE_SCOUT = 1 << 11,
}; };
#define OFFSET(x) offsetof(GraphMonitorContext, x) #define OFFSET(x) offsetof(GraphMonitorContext, x)
@ -88,6 +90,8 @@ static const AVOption graphmonitor_options[] = {
{ "size", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MODE_SIZE}, 0, 0, VF, "flags" }, { "size", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MODE_SIZE}, 0, 0, VF, "flags" },
{ "rate", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MODE_RATE}, 0, 0, VF, "flags" }, { "rate", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MODE_RATE}, 0, 0, VF, "flags" },
{ "eof", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MODE_EOF}, 0, 0, VF, "flags" }, { "eof", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MODE_EOF}, 0, 0, VF, "flags" },
{ "sample_count_in", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MODE_SCOUT}, 0, 0, VF, "flags" },
{ "sample_count_out", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MODE_SCIN}, 0, 0, VF, "flags" },
{ "rate", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, VF }, { "rate", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, VF },
{ "r", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, VF }, { "r", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, VF },
{ NULL } { NULL }
@ -229,6 +233,16 @@ static void draw_items(AVFilterContext *ctx, AVFrame *out,
drawtext(out, xpos, ypos, buffer, s->white); drawtext(out, xpos, ypos, buffer, s->white);
xpos += strlen(buffer) * 8; xpos += strlen(buffer) * 8;
} }
if (s->flags & MODE_SCIN) {
snprintf(buffer, sizeof(buffer)-1, " | sin: %"PRId64, l->sample_count_in);
drawtext(out, xpos, ypos, buffer, s->white);
xpos += strlen(buffer) * 8;
}
if (s->flags & MODE_SCOUT) {
snprintf(buffer, sizeof(buffer)-1, " | sout: %"PRId64, l->sample_count_out);
drawtext(out, xpos, ypos, buffer, s->white);
xpos += strlen(buffer) * 8;
}
if (s->flags & MODE_PTS) { if (s->flags & MODE_PTS) {
snprintf(buffer, sizeof(buffer)-1, " | pts: %s", av_ts2str(l->current_pts_us)); snprintf(buffer, sizeof(buffer)-1, " | pts: %s", av_ts2str(l->current_pts_us));
drawtext(out, xpos, ypos, buffer, s->white); drawtext(out, xpos, ypos, buffer, s->white);

Loading…
Cancel
Save