8be701d9f7
Up until now, an AVFilter's lists of input and output AVFilterPads were terminated by a sentinel and the only way to get the length of these lists was by using avfilter_pad_count(). This has two drawbacks: first, sizeof(AVFilterPad) is not negligible (i.e. 64B on 64bit systems); second, getting the size involves a function call instead of just reading the data. This commit therefore changes this. The sentinels are removed and new private fields nb_inputs and nb_outputs are added to AVFilter that contain the number of elements of the respective AVFilterPad array. Given that AVFilter.(in|out)puts are the only arrays of zero-terminated AVFilterPads an API user has access to (AVFilterContext.(in|out)put_pads are not zero-terminated and they already have a size field) the argument to avfilter_pad_count() is always one of these lists, so it just has to find the filter the list belongs to and read said number. This is slower than before, but a replacement function that just reads the internal numbers that users are expected to switch to will be added soon; and furthermore, avfilter_pad_count() is probably never called in hot loops anyway. This saves about 49KiB from the binary; notice that these sentinels are not in .bss despite being zeroed: they are in .data.rel.ro due to the non-sentinels. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
114 lines
3.0 KiB
C
114 lines
3.0 KiB
C
/*
|
|
* Copyright (C) 2017 Paul B Mahol
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "libavutil/common.h"
|
|
#include "libavutil/opt.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct VFRDETContext {
|
|
const AVClass *class;
|
|
|
|
int64_t prev_pts;
|
|
int64_t delta;
|
|
int64_t min_delta;
|
|
int64_t max_delta;
|
|
int64_t avg_delta;
|
|
|
|
uint64_t vfr;
|
|
uint64_t cfr;
|
|
} VFRDETContext;
|
|
|
|
static int filter_frame(AVFilterLink *inlink, AVFrame *in)
|
|
{
|
|
AVFilterContext *ctx = inlink->dst;
|
|
VFRDETContext *s = ctx->priv;
|
|
|
|
if (s->prev_pts != AV_NOPTS_VALUE) {
|
|
int64_t delta = in->pts - s->prev_pts;
|
|
|
|
if (s->delta == AV_NOPTS_VALUE) {
|
|
s->delta = delta;
|
|
s->min_delta = delta;
|
|
s->max_delta = delta;
|
|
}
|
|
|
|
if (s->delta != delta) {
|
|
s->vfr++;
|
|
s->delta = delta;
|
|
s->min_delta = FFMIN(delta, s->min_delta);
|
|
s->max_delta = FFMAX(delta, s->max_delta);
|
|
s->avg_delta += delta;
|
|
} else {
|
|
s->cfr++;
|
|
}
|
|
}
|
|
|
|
s->prev_pts = in->pts;
|
|
|
|
return ff_filter_frame(ctx->outputs[0], in);
|
|
}
|
|
|
|
static av_cold int init(AVFilterContext *ctx)
|
|
{
|
|
VFRDETContext *s = ctx->priv;
|
|
|
|
s->prev_pts = AV_NOPTS_VALUE;
|
|
s->delta = AV_NOPTS_VALUE;
|
|
s->min_delta = INT64_MAX;
|
|
s->max_delta = INT64_MIN;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold void uninit(AVFilterContext *ctx)
|
|
{
|
|
VFRDETContext *s = ctx->priv;
|
|
|
|
av_log(ctx, AV_LOG_INFO, "VFR:%f (%"PRIu64"/%"PRIu64")", s->vfr / (float)(s->vfr + s->cfr), s->vfr, s->cfr);
|
|
if (s->vfr)
|
|
av_log(ctx, AV_LOG_INFO, " min: %"PRId64" max: %"PRId64" avg: %"PRId64, s->min_delta, s->max_delta, s->avg_delta / s->vfr);
|
|
av_log(ctx, AV_LOG_INFO, "\n");
|
|
}
|
|
|
|
static const AVFilterPad vfrdet_inputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.filter_frame = filter_frame,
|
|
},
|
|
};
|
|
|
|
static const AVFilterPad vfrdet_outputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
},
|
|
};
|
|
|
|
const AVFilter ff_vf_vfrdet = {
|
|
.name = "vfrdet",
|
|
.description = NULL_IF_CONFIG_SMALL("Variable frame rate detect filter."),
|
|
.priv_size = sizeof(VFRDETContext),
|
|
.init = init,
|
|
.uninit = uninit,
|
|
FILTER_INPUTS(vfrdet_inputs),
|
|
FILTER_OUTPUTS(vfrdet_outputs),
|
|
};
|