"N", ///< frame / sample number (starting at zero)
"NB_CONSUMED_SAMPLES", ///< number of samples consumed by the filter (only audio)
"NB_SAMPLES", ///< number of samples in the current frame (only audio)
+#if FF_API_FRAME_PKT
"POS", ///< original position in the file of the frame
+#endif
"PREV_INPTS", ///< previous input PTS
"PREV_INT", ///< previous input time in seconds
"PREV_OUTPTS", ///< previous output PTS
"S", // Number of samples in the current frame
"SR", // Audio sample rate
"FR", ///< defined only for constant frame-rate video
+ "T_CHANGE", ///< time of first frame after latest command was applied
NULL
};
VAR_N,
VAR_NB_CONSUMED_SAMPLES,
VAR_NB_SAMPLES,
+#if FF_API_FRAME_PKT
VAR_POS,
+#endif
VAR_PREV_INPTS,
VAR_PREV_INT,
VAR_PREV_OUTPTS,
VAR_S,
VAR_SR,
VAR_FR,
- VAR_VARS_NB
+ VAR_T_CHANGE,
+ VAR_VARS_NB,
};
typedef struct SetPTSContext {
setpts->var_values[VAR_PREV_OUTT] = NAN;
setpts->var_values[VAR_STARTPTS] = NAN;
setpts->var_values[VAR_STARTT] = NAN;
+ setpts->var_values[VAR_T_CHANGE] = NAN;
return 0;
}
setpts->var_values[VAR_STARTPTS] = TS2D(pts);
setpts->var_values[VAR_STARTT ] = TS2T(pts, inlink->time_base);
}
+ if (isnan(setpts->var_values[VAR_T_CHANGE])) {
+ setpts->var_values[VAR_T_CHANGE] = TS2T(pts, inlink->time_base);
+ }
setpts->var_values[VAR_PTS ] = TS2D(pts);
setpts->var_values[VAR_T ] = TS2T(pts, inlink->time_base);
+#if FF_API_FRAME_PKT
+FF_DISABLE_DEPRECATION_WARNINGS
setpts->var_values[VAR_POS ] = !frame || frame->pkt_pos == -1 ? NAN : frame->pkt_pos;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
setpts->var_values[VAR_RTCTIME ] = av_gettime();
if (frame) {
if (inlink->type == AVMEDIA_TYPE_VIDEO) {
- setpts->var_values[VAR_INTERLACED] = frame->interlaced_frame;
+ setpts->var_values[VAR_INTERLACED] = !!(frame->flags & AV_FRAME_FLAG_INTERLACED);
} else if (inlink->type == AVMEDIA_TYPE_AUDIO) {
setpts->var_values[VAR_S] = frame->nb_samples;
setpts->var_values[VAR_NB_SAMPLES] = frame->nb_samples;
frame->pts = D2TS(d);
av_log(inlink->dst, AV_LOG_TRACE,
- "N:%"PRId64" PTS:%s T:%f POS:%s",
+ "N:%"PRId64" PTS:%s T:%f",
(int64_t)setpts->var_values[VAR_N],
d2istr(setpts->var_values[VAR_PTS]),
- setpts->var_values[VAR_T],
- d2istr(setpts->var_values[VAR_POS]));
+ setpts->var_values[VAR_T]);
switch (inlink->type) {
case AVMEDIA_TYPE_VIDEO:
av_log(inlink->dst, AV_LOG_TRACE, " INTERLACED:%"PRId64,
if (ff_inlink_acknowledge_status(inlink, &status, &pts)) {
double d = eval_pts(setpts, inlink, NULL, pts);
- av_log(ctx, AV_LOG_TRACE, "N:EOF PTS:%s T:%f POS:%s -> PTS:%s T:%f\n",
+ av_log(ctx, AV_LOG_TRACE, "N:EOF PTS:%s T:%f -> PTS:%s T:%f\n",
d2istr(setpts->var_values[VAR_PTS]),
setpts->var_values[VAR_T],
- d2istr(setpts->var_values[VAR_POS]),
d2istr(d), TS2T(d, inlink->time_base));
ff_outlink_set_status(outlink, status, D2TS(d));
return 0;
setpts->expr = NULL;
}
+static int process_command(AVFilterContext *ctx, const char *cmd, const char *arg,
+ char *res, int res_len, int flags)
+{
+ SetPTSContext *setpts = ctx->priv;
+ AVExpr *new_expr;
+ int ret;
+
+ ret = ff_filter_process_command(ctx, cmd, arg, res, res_len, flags);
+
+ if (ret < 0)
+ return ret;
+
+ if (!strcmp(cmd, "expr")) {
+ ret = av_expr_parse(&new_expr, arg, var_names, NULL, NULL, NULL, NULL, 0, ctx);
+ // Only free and replace previous expression if new one succeeds,
+ // otherwise defensively keep everything intact even if reporting an error.
+ if (ret < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Error while parsing expression '%s'\n", arg);
+ } else {
+ av_expr_free(setpts->expr);
+ setpts->expr = new_expr;
+ setpts->var_values[VAR_T_CHANGE] = NAN;
+ }
+ } else {
+ ret = AVERROR(EINVAL);
+ }
+
+ return ret;
+}
+
#define OFFSET(x) offsetof(SetPTSContext, x)
#define V AV_OPT_FLAG_VIDEO_PARAM
#define A AV_OPT_FLAG_AUDIO_PARAM
+#define R AV_OPT_FLAG_RUNTIME_PARAM
#define F AV_OPT_FLAG_FILTERING_PARAM
#if CONFIG_SETPTS_FILTER
static const AVOption setpts_options[] = {
- { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = V|F },
+ { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = V|F|R },
{ NULL }
};
AVFILTER_DEFINE_CLASS(setpts);
},
};
-static const AVFilterPad avfilter_vf_setpts_outputs[] = {
- {
- .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- },
-};
-
const AVFilter ff_vf_setpts = {
- .name = "setpts",
- .description = NULL_IF_CONFIG_SMALL("Set PTS for the output video frame."),
- .init = init,
- .activate = activate,
- .uninit = uninit,
- .flags = AVFILTER_FLAG_METADATA_ONLY,
+ .name = "setpts",
+ .description = NULL_IF_CONFIG_SMALL("Set PTS for the output video frame."),
+ .init = init,
+ .activate = activate,
+ .uninit = uninit,
+ .process_command = process_command,
+ .flags = AVFILTER_FLAG_METADATA_ONLY,
.priv_size = sizeof(SetPTSContext),
.priv_class = &setpts_class,
FILTER_INPUTS(avfilter_vf_setpts_inputs),
- FILTER_OUTPUTS(avfilter_vf_setpts_outputs),
+ FILTER_OUTPUTS(ff_video_default_filterpad),
};
#endif /* CONFIG_SETPTS_FILTER */
#if CONFIG_ASETPTS_FILTER
static const AVOption asetpts_options[] = {
- { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = A|F },
+ { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = A|F|R },
{ NULL }
};
AVFILTER_DEFINE_CLASS(asetpts);
},
};
-static const AVFilterPad asetpts_outputs[] = {
- {
- .name = "default",
- .type = AVMEDIA_TYPE_AUDIO,
- },
-};
-
const AVFilter ff_af_asetpts = {
- .name = "asetpts",
- .description = NULL_IF_CONFIG_SMALL("Set PTS for the output audio frame."),
- .init = init,
- .activate = activate,
- .uninit = uninit,
- .priv_size = sizeof(SetPTSContext),
- .priv_class = &asetpts_class,
- .flags = AVFILTER_FLAG_METADATA_ONLY,
+ .name = "asetpts",
+ .description = NULL_IF_CONFIG_SMALL("Set PTS for the output audio frame."),
+ .init = init,
+ .activate = activate,
+ .uninit = uninit,
+ .process_command = process_command,
+ .priv_size = sizeof(SetPTSContext),
+ .priv_class = &asetpts_class,
+ .flags = AVFILTER_FLAG_METADATA_ONLY,
FILTER_INPUTS(asetpts_inputs),
- FILTER_OUTPUTS(asetpts_outputs),
+ FILTER_OUTPUTS(ff_audio_default_filterpad),
};
#endif /* CONFIG_ASETPTS_FILTER */
projects / platform / upstream / ffmpeg.git / blobdiff