From patchwork Mon Feb 14 22:41:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34292 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5923963nkb; Mon, 14 Feb 2022 14:43:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwMpV3SOiPio5yRHa90+D5X1Zd9vzihwH5p0QFADr+H6Ycr3cztEX8f2//WF0DSHi/N7NoZ X-Received: by 2002:a05:6402:1d4b:: with SMTP id dz11mr1120411edb.202.1644878584535; Mon, 14 Feb 2022 14:43:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644878584; cv=none; d=google.com; s=arc-20160816; b=lFgZC2LOMcFtrOtcW7eeZErmFp/Bf49QIoDiND5wX2Bdkf8guyE+YkURCfbzH57zju fRtJraOWkT/8gT9QVx9OvX5rgJv9xFcylo0VVRkv0w01/cot5AhRsraGJIL9hBETo+E2 ksvMdPz2bIKMNfWk9guZYdHECSsZ+gWBVlwZXDylMhHsdSl35CsX8JV6A8oZYRDmLqhU FVTZ26xqBE0S6nJjX4jFh3jWsVvAeA0zIMt+Y6nrLg6cXjGwD2+xiAllHLN9R7kILi8A UPJtDE0KhQK+8aP+m9TbXKjJltIvUEWE9fmYGoWpvhQG9fv9PnNm1ClV89lqYVL4Ti1P BRUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=M728h4f/EwI/TvQoSqjBRCrixCYgLnOTXVVpf/MEEw0=; b=XveZG3MBcfpVEPMehy/KQa2mf97TdGxNqU7Ywwms0Ne+O0q+8/yOCrjjYBTb7OPz51 ewyxfP6VRcPPBBwdatwukXR94MLdz7JrQMiWwl/BD4mJ13i5X6UUfUl1DYb6wY2gnFvW lMEAQaXEET6U+/hWOed2Nqb5MU7lsDLJDHSmFTT7w6oz9wB8YbcpECeL9WO6rCv8Sh1A OwKm8AqZNSrUdFYoFOD5B+JX5A3QNhVOmpH5b+vbmrBJjqYsEvYjXdsfRfN/poJxmRyz LMwJn8AZmSym4zeC0W5HUJQDcs31S+Aq2676YTdisnA1i6XRasUkiPe0CNn7qgNWTGxf FaOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=drMQSjc4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hg3si1541521ejc.930.2022.02.14.14.43.03; Mon, 14 Feb 2022 14:43:04 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=drMQSjc4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1470768B1E7; Tue, 15 Feb 2022 00:42:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6DA268B1B5 for ; Tue, 15 Feb 2022 00:42:21 +0200 (EET) Received: by mail-oi1-f174.google.com with SMTP id 4so18970414oil.11 for ; Mon, 14 Feb 2022 14:42:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=C9KzgV7W+q3ugBCez/4IYJOH7POA+TYwHwpi7HN+Dag=; b=drMQSjc4JVr2KM33InxS8kuYEaKOyQZI+2878o1edFrZYyVOB+B2H6dY+tPQbKsx0M aqeF+MQpd0yLlUZwBYtIMUzk4Oi5hbU7nNMzH7wc49icN0qypVMACXGjELYZVOLKPXKP oENKwf7RqoNggaYpcM1NaOgAUDgivDzCsHxUEmr5ZVr+mlbL2VdrfvzVAP+EVZfzzAI1 3yPdjGuCg5Ukc/wyRNTjm/z0dWp5zHoXgC8EmG11pHuUGp/+74xA3/ezH9sC4/2UdlZU 4ogze+H4brkyCX+tuSSnt3xhC6ojUFUW8MFLOyQTwmxmq7FULtMRtlLqWFQwTO/VnOOk +mbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C9KzgV7W+q3ugBCez/4IYJOH7POA+TYwHwpi7HN+Dag=; b=WcDC3CLjTcimdQMLXNZ0+rIJOhdDRrz1iPjz6HvGNWEdNEnBG4IABlTewhTFdoqwQB YrtoQqDUHMWmB6xp3qn2iMoa2XlWxn4c7GhoGH24JVg9ELq+n0WA8m2zTW7iCUjUlO9i 9y+F3W0oamTn3irOW/vm0o5HmUuy8x688iU0XqEI9fzMB3dcArJX0cRPYEImSwmIuhhf mki171jCdtEs0XNqhTjSty/Kkpl1DXU+JBPS5RvuYhjxsedW8yE27pVTI4dlom2ZwsOs Smwb9IorzFGVxsLUQXh4xiUj7Rq5cloFhqwmbx+t4ZV09aWEQ3gtMT94a9vPlK2548/o RCdw== X-Gm-Message-State: AOAM532QmRYPJSL430AghbC/aAMDFyudBX9iFlU0zAKvmFHVQxzF4PiL HoUjnLogudWnXHIXPBUR+e1NMXUTDacYMA== X-Received: by 2002:a05:6808:1b29:b0:2ce:6ee7:2cc5 with SMTP id bx41-20020a0568081b2900b002ce6ee72cc5mr431975oib.243.1644878539718; Mon, 14 Feb 2022 14:42:19 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a8sm13199885otj.47.2022.02.14.14.42.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 14:42:19 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Feb 2022 19:41:55 -0300 Message-Id: <20220214224156.39862-5-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220214224156.39862-1-jamrial@gmail.com> References: <20220214224156.39862-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/setts_bsf: add NEXT_PTS/DTS expression constants X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 52ZzeEZfbjdu They correspond to the relevant fields in the packet that follows the one where the expressions are being applied to. Signed-off-by: James Almer --- Missing doc changes. libavcodec/setts_bsf.c | 76 ++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 25 deletions(-) diff --git a/libavcodec/setts_bsf.c b/libavcodec/setts_bsf.c index d604f91f71..35266ee251 100644 --- a/libavcodec/setts_bsf.c +++ b/libavcodec/setts_bsf.c @@ -37,6 +37,8 @@ static const char *const var_names[] = { "PREV_INDTS", ///< previous input DTS "PREV_OUTPTS", ///< previous output PTS "PREV_OUTDTS", ///< previous output DTS + "NEXT_PTS", ///< next input PTS + "NEXT_DTS", ///< next input DTS "PTS", ///< original PTS in the file of the frame "DTS", ///< original DTS in the file of the frame "STARTPTS", ///< PTS at start of movie @@ -55,6 +57,8 @@ enum var_name { VAR_PREV_INDTS, VAR_PREV_OUTPTS, VAR_PREV_OUTDTS, + VAR_NEXT_PTS, + VAR_NEXT_DTS, VAR_PTS, VAR_DTS, VAR_STARTPTS, @@ -76,16 +80,16 @@ typedef struct SetTSContext { int64_t start_pts; int64_t start_dts; - int64_t prev_inpts; - int64_t prev_indts; - int64_t prev_outpts; - int64_t prev_outdts; double var_values[VAR_VARS_NB]; AVExpr *ts_expr; AVExpr *pts_expr; AVExpr *dts_expr; + + AVPacket *prev_inpkt; + AVPacket *prev_outpkt; + AVPacket *cur_pkt; } SetTSContext; static int setts_init(AVBSFContext *ctx) @@ -93,6 +97,12 @@ static int setts_init(AVBSFContext *ctx) SetTSContext *s = ctx->priv_data; int ret; + s->prev_inpkt = av_packet_alloc(); + s->prev_outpkt = av_packet_alloc(); + s->cur_pkt = av_packet_alloc(); + if (!s->prev_inpkt || !s->prev_outpkt || !s->cur_pkt) + return AVERROR(ENOMEM); + if ((ret = av_expr_parse(&s->ts_expr, s->ts_str, var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) { av_log(ctx, AV_LOG_ERROR, "Error while parsing ts expression '%s'\n", s->ts_str); @@ -118,10 +128,6 @@ static int setts_init(AVBSFContext *ctx) s->frame_number= 0; s->start_pts = AV_NOPTS_VALUE; s->start_dts = AV_NOPTS_VALUE; - s->prev_inpts = AV_NOPTS_VALUE; - s->prev_indts = AV_NOPTS_VALUE; - s->prev_outpts = AV_NOPTS_VALUE; - s->prev_outdts = AV_NOPTS_VALUE; s->var_values[VAR_NOPTS] = AV_NOPTS_VALUE; return 0; @@ -134,24 +140,31 @@ static int setts_filter(AVBSFContext *ctx, AVPacket *pkt) int ret; ret = ff_bsf_get_packet_ref(ctx, pkt); - if (ret < 0) + if (ret < 0 && (ret != AVERROR_EOF || !s->cur_pkt->data)) return ret; + if (!s->cur_pkt->data) { + av_packet_move_ref(s->cur_pkt, pkt); + return AVERROR(EAGAIN); + } + if (s->start_pts == AV_NOPTS_VALUE) - s->start_pts = pkt->pts; + s->start_pts = s->cur_pkt->pts; if (s->start_dts == AV_NOPTS_VALUE) - s->start_dts = pkt->dts; + s->start_dts = s->cur_pkt->dts; s->var_values[VAR_N] = s->frame_number++; - s->var_values[VAR_TS] = pkt->dts; - s->var_values[VAR_POS] = pkt->pos; - s->var_values[VAR_PTS] = pkt->pts; - s->var_values[VAR_DTS] = pkt->dts; - s->var_values[VAR_PREV_INPTS] = s->prev_inpts; - s->var_values[VAR_PREV_INDTS] = s->prev_indts; - s->var_values[VAR_PREV_OUTPTS] = s->prev_outpts; - s->var_values[VAR_PREV_OUTDTS] = s->prev_outdts; + s->var_values[VAR_TS] = s->cur_pkt->dts; + s->var_values[VAR_POS] = s->cur_pkt->pos; + s->var_values[VAR_PTS] = s->cur_pkt->pts; + s->var_values[VAR_DTS] = s->cur_pkt->dts; + s->var_values[VAR_PREV_INPTS] = s->prev_inpkt->pts; + s->var_values[VAR_PREV_INDTS] = s->prev_inpkt->dts; + s->var_values[VAR_PREV_OUTPTS] = s->prev_outpkt->pts; + s->var_values[VAR_PREV_OUTDTS] = s->prev_outpkt->dts; + s->var_values[VAR_NEXT_PTS] = pkt->pts; + s->var_values[VAR_NEXT_DTS] = pkt->dts; s->var_values[VAR_STARTPTS] = s->start_pts; s->var_values[VAR_STARTDTS] = s->start_dts; s->var_values[VAR_TB] = ctx->time_base_out.den ? av_q2d(ctx->time_base_out) : 0; @@ -160,27 +173,35 @@ static int setts_filter(AVBSFContext *ctx, AVPacket *pkt) new_ts = llrint(av_expr_eval(s->ts_expr, s->var_values, NULL)); if (s->pts_str) { - s->var_values[VAR_TS] = pkt->pts; + s->var_values[VAR_TS] = s->cur_pkt->pts; new_pts = llrint(av_expr_eval(s->pts_expr, s->var_values, NULL)); } else { new_pts = new_ts; } if (s->dts_str) { - s->var_values[VAR_TS] = pkt->dts; + s->var_values[VAR_TS] = s->cur_pkt->dts; new_dts = llrint(av_expr_eval(s->dts_expr, s->var_values, NULL)); } else { new_dts = new_ts; } - s->prev_inpts = pkt->pts; - s->prev_indts = pkt->dts; - s->prev_outpts = new_pts; - s->prev_outdts = new_dts; + av_packet_unref(s->prev_inpkt); + av_packet_unref(s->prev_outpkt); + av_packet_move_ref(s->prev_inpkt, s->cur_pkt); + av_packet_move_ref(s->cur_pkt, pkt); + + ret = av_packet_ref(pkt, s->prev_inpkt); + if (ret < 0) + return ret; pkt->pts = new_pts; pkt->dts = new_dts; + ret = av_packet_ref(s->prev_outpkt, pkt); + if (ret < 0) + av_packet_unref(pkt); + return ret; } @@ -188,6 +209,10 @@ static void setts_close(AVBSFContext *bsf) { SetTSContext *s = bsf->priv_data; + av_packet_free(&s->prev_inpkt); + av_packet_free(&s->prev_outpkt); + av_packet_free(&s->cur_pkt); + av_expr_free(s->ts_expr); s->ts_expr = NULL; av_expr_free(s->pts_expr); @@ -220,4 +245,5 @@ const AVBitStreamFilter ff_setts_bsf = { .init = setts_init, .close = setts_close, .filter = setts_filter, + .capabilities = AV_BSF_CAP_DELAY, };