From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 892684214C for ; Wed, 23 Feb 2022 15:04:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 95EBB68B2AF; Wed, 23 Feb 2022 17:04:33 +0200 (EET) Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95D8F68B190 for ; Wed, 23 Feb 2022 17:04:26 +0200 (EET) Received: by mail-oo1-f51.google.com with SMTP id y15-20020a4a650f000000b0031c19e9fe9dso19670211ooc.12 for ; Wed, 23 Feb 2022 07:04:26 -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=LiUFAeoIssFxZjRZA9YUZ9PxbjolrtqqegEDGB1mza4=; b=lwARENQICUo1/+aGYthsNq9v7aQG+ypokTGSshkKieFS1PlWwvWi+EAqzdDg/+72so oglofDXyrLQclVTMQQSO0r2Xfn7Vf9b1Q2Temss3EXsu5Jfmt4dSnPoOIdeXJ5HZXZIz cB7H9OBAPEzrnfXX3bQM17afzCcsB2f+AiVU7E1FfBrIseQEwRcj3daXK6e9jvnDHTf1 hTd2jJMokI8itBvH9WLwzHPmOr7PQe2D1VOKcUf9cOwZy2t1HSV32Zx0mwJQnyb/mOgf GYMCsa+oR3bwOAju2t2GUcb/oPy2nQjrCLjbQrXU9R1O0V8yjIpLBJAR5axgnUVNfLBW 8ixg== 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=LiUFAeoIssFxZjRZA9YUZ9PxbjolrtqqegEDGB1mza4=; b=o495uBJac6PEi5khDzFQ5ZDJYQVVzoM8XCf6eXu8tsJ6dmZq+AfZsdFInBlygB0gvu qpwKoXCJY//1Qg3pOyb8BbgiYC3xLl9zytVS08eLINQUwur81g/wlQrBaAQBQvPAFHrR QYu8v0w1l4pFBMFSrW3lDCgB+BPN0QmRJ/SpL1S74RONOXoQ2o7cCtyq0GmOx6ID4wl2 BWmDUdloud7N64/YBl9DwOYXL1gz7IPYYyACLV5FNhR+XAJNI3f4VoLmYXn6aYfn4Jtx jf/YNBoHd/XY3d1tbMD8ZFlkGsohBSEtMUoGZAwDQePg5SvPXJkTfMLhBntPcB6GLWSI gG9w== X-Gm-Message-State: AOAM532wAumKvrcwus8I4CaRxkIvYayXxkSTNfiahIJMMRdC4QmVK0EX RfofXRVFI5avZ+u79yNtZXukIOHo6w9TWw== X-Google-Smtp-Source: ABdhPJwH3qWFxRIP9pwjfB3bUODIhUqC/3ILxsHkQ19RNMiK2SL2o2YXPugF0t42CLQtND0pXy8J2g== X-Received: by 2002:a05:6870:c990:b0:ce:c0c9:655 with SMTP id hi16-20020a056870c99000b000cec0c90655mr4034818oab.167.1645628664492; Wed, 23 Feb 2022 07:04:24 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id o2sm8571449otl.9.2022.02.23.07.04.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 07:04:23 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 12:03:54 -0300 Message-Id: <20220223150355.944-3-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220223150355.944-1-jamrial@gmail.com> References: <20220223150355.944-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: They correspond to the relevant fields from the packet that follows the one where the expressions are being applied. Signed-off-by: James Almer --- No changes since last version. Already LGTM'd by Paul. libavcodec/setts_bsf.c | 75 ++++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/libavcodec/setts_bsf.c b/libavcodec/setts_bsf.c index d604f91f71..f0243a1114 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); -- 2.35.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".