From patchwork Mon Sep 30 12:05:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 15411 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 20F914480D3 for ; Mon, 30 Sep 2019 15:11:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFF246881A6; Mon, 30 Sep 2019 15:11:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2660C68812B for ; Mon, 30 Sep 2019 15:11:43 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id v17so12437477wml.4 for ; Mon, 30 Sep 2019 05:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=/pcIvASjXk3oXrJxXDUX/jIgPwpXN6dVuIuPgovhCns=; b=hr3ieRzu+7JMqZ9zMc8aBZuK37sJGRcZQGw1ofZ4YN7B6sDZBhk0fL+PNrCSeitboB OtVVfrWFzWN5lh5QrjEQHt74zepsvVrMoKaRE0vN/Cz1w3/6rten2zmvl7EUbChAZtWf lX42aYvnRQGOD2XTxU3G9Zww142jrGF5nxOPGFsyb45cFl5jKaQWUykmOFBALZcJH5lr bwHaDhPdlskTIJO5qEPftZAs15dg3pssVaA3s0wMkK+MXChAP1IGzFHI+sOseaXLOLvx d4ZRY1LyJoD14N/Nwi0KHHwjULb+nS11WRlvonU6H9j+mA5vXmOzu0aUDPBcCKlAVsxq kwsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=/pcIvASjXk3oXrJxXDUX/jIgPwpXN6dVuIuPgovhCns=; b=P6FPmUBzIQAfBW4o5NJ4dxjVhiFM0dcKMQ9W6NP81zXEnQHJrZxZzIvVvpiQ3KfvPF DDK5jsAmpqk7ZRM3CX1ss9KW6UwG/mVfLgS3LBcYRiqcKzybJq3HO5zdQ3hac3Ot7rN+ +jzf9v5jWRvKmp2PGsdwF2pBNkTU+hrf03RFrEdmNBucrOPbsQR4Zv1tTRyL7mR7qoW1 BZh2vbTH71egC7QbG+kC/37mNJKY7U6+zalVdIjMf0lXSnCqYaV5pRnhbfvVe03IVdSU 4CVtvf1tznVAoBOJ6rpLH1J02HxpP9mpEWzf1qg+or2yGeZfThKuC2gIRK0vf8ZAjS5l v7MQ== X-Gm-Message-State: APjAAAWmNhEUw5PMy1CZ04kPvrSchZh7/Vm0IXKrmgfAMqtHCNcK6ICG gKHkygWYqVpTBktMwLz/wGdN0h+w X-Google-Smtp-Source: APXvYqyTYUh8uN4ABnVm6xy3cPLTm3mv9bwwxy8sJLGpDqn6DDCfqGclSnbiuXEZb7wynpyzz46ofw== X-Received: by 2002:a1c:d188:: with SMTP id i130mr17529997wmg.101.1569845118678; Mon, 30 Sep 2019 05:05:18 -0700 (PDT) Received: from localhost.localdomain ([109.227.36.151]) by smtp.gmail.com with ESMTPSA id i5sm11586658wmd.21.2019.09.30.05.05.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 05:05:17 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Sep 2019 14:05:09 +0200 Message-Id: <20190930120509.19403-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/setpts: switch to activate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also properly handle EOF timestamps. Fixes #6833. Signed-off-by: Paul B Mahol --- libavfilter/setpts.c | 74 ++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 19 deletions(-) diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 800ba6a83f..076534c518 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -33,6 +33,7 @@ #include "libavutil/time.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" @@ -154,6 +155,28 @@ static inline char *double2int64str(char *buf, double v) return buf; } +static double eval_pts(SetPTSContext *setpts, AVFilterLink *inlink, AVFrame *frame, int64_t pts) +{ + if (isnan(setpts->var_values[VAR_STARTPTS])) { + setpts->var_values[VAR_STARTPTS] = TS2D(pts); + setpts->var_values[VAR_STARTT ] = TS2T(pts, inlink->time_base); + } + setpts->var_values[VAR_PTS ] = TS2D(pts); + setpts->var_values[VAR_T ] = TS2T(pts, inlink->time_base); + setpts->var_values[VAR_POS ] = !frame || frame->pkt_pos == -1 ? NAN : frame->pkt_pos; + setpts->var_values[VAR_RTCTIME ] = av_gettime(); + + if (frame) { + if (inlink->type == AVMEDIA_TYPE_VIDEO) { + setpts->var_values[VAR_INTERLACED] = frame->interlaced_frame; + } else if (inlink->type == AVMEDIA_TYPE_AUDIO) { + setpts->var_values[VAR_S] = frame->nb_samples; + setpts->var_values[VAR_NB_SAMPLES] = frame->nb_samples; + } + } + + return av_expr_eval(setpts->expr, setpts->var_values, NULL); +} #define d2istr(v) double2int64str((char[BUF_SIZE]){0}, v) static int filter_frame(AVFilterLink *inlink, AVFrame *frame) @@ -162,23 +185,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) int64_t in_pts = frame->pts; double d; - if (isnan(setpts->var_values[VAR_STARTPTS])) { - setpts->var_values[VAR_STARTPTS] = TS2D(frame->pts); - setpts->var_values[VAR_STARTT ] = TS2T(frame->pts, inlink->time_base); - } - setpts->var_values[VAR_PTS ] = TS2D(frame->pts); - setpts->var_values[VAR_T ] = TS2T(frame->pts, inlink->time_base); - setpts->var_values[VAR_POS ] = frame->pkt_pos == -1 ? NAN : frame->pkt_pos; - setpts->var_values[VAR_RTCTIME ] = av_gettime(); - - if (inlink->type == AVMEDIA_TYPE_VIDEO) { - setpts->var_values[VAR_INTERLACED] = frame->interlaced_frame; - } else if (inlink->type == AVMEDIA_TYPE_AUDIO) { - setpts->var_values[VAR_S] = frame->nb_samples; - setpts->var_values[VAR_NB_SAMPLES] = frame->nb_samples; - } - - d = av_expr_eval(setpts->expr, setpts->var_values, NULL); + d = eval_pts(setpts, inlink, frame, frame->pts); frame->pts = D2TS(d); av_log(inlink->dst, AV_LOG_TRACE, @@ -216,6 +223,35 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return ff_filter_frame(inlink->dst->outputs[0], frame); } +static int activate(AVFilterContext *ctx) +{ + SetPTSContext *setpts = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *in; + int status; + int64_t pts; + int ret; + + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + + ret = ff_inlink_consume_frame(inlink, &in); + if (ret < 0) + return ret; + if (ret > 0) + return filter_frame(inlink, in); + + if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { + pts = D2TS(eval_pts(setpts, inlink, NULL, pts)); + ff_outlink_set_status(outlink, status, pts); + return 0; + } + + FF_FILTER_FORWARD_WANTED(outlink, inlink); + + return FFERROR_NOT_READY; +} + static av_cold void uninit(AVFilterContext *ctx) { SetPTSContext *setpts = ctx->priv; @@ -239,7 +275,6 @@ static const AVFilterPad avfilter_vf_setpts_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input, - .filter_frame = filter_frame, }, { NULL } }; @@ -256,6 +291,7 @@ AVFilter ff_vf_setpts = { .name = "setpts", .description = NULL_IF_CONFIG_SMALL("Set PTS for the output video frame."), .init = init, + .activate = activate, .uninit = uninit, .priv_size = sizeof(SetPTSContext), @@ -276,7 +312,6 @@ static const AVFilterPad asetpts_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, .config_props = config_input, - .filter_frame = filter_frame, }, { NULL } }; @@ -293,6 +328,7 @@ 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,