From patchwork Sat Jul 3 19:31:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp2752328ios; Sat, 3 Jul 2021 12:31:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwoQYtdbqLlBEHM0lXzw6xVhwKLKEf4OUJxy/8W8lZDBMsL0LyMj4gEdx2bfraXARXBIS4t X-Received: by 2002:aa7:cc0c:: with SMTP id q12mr6763039edt.90.1625340711561; Sat, 03 Jul 2021 12:31:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625340711; cv=none; d=google.com; s=arc-20160816; b=xs2BMx6bl/2+HqpmK/lHvpvyDUsOsWjVvFWwyYIXBlf9gR0ZR0ncU3mptOnMHPbz9/ 8htwkoOH/Fli3NQvpmA2K8WvESt6Tq7Jxe+LBxbnyj+pmd6Mi9Y6ZsIISLHhsO6Mo5hB I+mjOiHOSVNeINWZcSxOSF4APkMxQpdtYUd0CTyIFrbH13i/RwET7QykPWkxIOGvwUM/ WiLIOcXOCTUBscff9l04mc+FQnzrFxwAx7I+JA0ipaIgYplsOf4gi/oUHywmSJqZCKyX uVTZR/Jh6GmoM8OT2uw2H9n5nSV5eg3BpPdQzkVbRcjt5q6vtydDGwJbdMLTx9Jgvoag 1oKQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=3DNfvxoNDPLoRxF+Bv78Bf9E5o/xr51aaScoSH7Mo7o=; b=G6HAbhC24wnTwJSYcYGsTUnNki3e2cBDWOkkBm7MTdHTWXM5A5rYi2848ebkaUqZou b5V+yPisNvhn3NB0rsu3tjaTerVDuXBNJSliQs5dGQZPKYtHGwNYVAVksLc6TtvjhlCR pIhEG3NVBbQ95wWsTyO2BGS19X6BoKzy0knYMzywukLs7E+e4FZn/S8ybAbspuyYQnIu Rp8VmmtQtt3ywnzjKk20PvNKfn00dPmSk6ABQVo2y7CalQSVrygB05PjcDNeW4vGdeef Jkt8qH+Tj9TcmwofCvLKLtIA3jYonjTzCorRkZcYZJjZJCiuNCEK+vbU5pBsv8+RjKIx Y26g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PXLRHzUw; 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 q23si6870569ejj.178.2021.07.03.12.31.50; Sat, 03 Jul 2021 12:31:51 -0700 (PDT) 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=20161025 header.b=PXLRHzUw; 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 4A017689902; Sat, 3 Jul 2021 22:31:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6B90689902 for ; Sat, 3 Jul 2021 22:31:40 +0300 (EEST) Received: by mail-pg1-f175.google.com with SMTP id a2so13761185pgi.6 for ; Sat, 03 Jul 2021 12:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=tVi6mQuviPHEZAkE+as2eBPDLsyBSPasrlKdo8U2rec=; b=PXLRHzUwoV6LURp0BeL4PyUwFV0Xi1ZMBNXDTyOIPt2dXFD90W/gF2VEp4Z5xLXJs1 aMwy0snVhYAZiWGCnlIrThsK342jS9vvF9BbY8enfWDSSmlRv8tydhVQh97xE5g3kSLL HqDv7jjw/zkrKiAxhB6KLYCrFVQoUtR0zhlkNsZfeSqh16CZecuSznSt+Z4fW6TMO2MN G79P2MtBgLcJG2eFWsNqSCOJ2NNf9/q87+DUxg9i9agJEHtFsJFox65gq0YUqQlyqrT+ pvodn43FvlPfORvvzJ7BdpWXut/Q3Flu6tnR0TRX/wr5zq4EO/zHR3BNKJ8WJ7xn2j8/ 9ntA== 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:mime-version :content-transfer-encoding; bh=tVi6mQuviPHEZAkE+as2eBPDLsyBSPasrlKdo8U2rec=; b=osfMEEkVmrf11s9Oeu7vHr31bHNQ8BWIHDpi7dhQeqA/UXe7mLtfmADRR5QDCnaKyp f/hNGEY/xbbhi+jWvv1B5yz4CNQ6XJ2ih6yXbSPQgorNVbItTuIaGomwYw6ASWu4Q50/ fVgBOIKaeo25je9kBNOk6JvunQAI8VdQ2hinH9s4fXgfFA53z86cGZlCklZi6IQGApbO YjNOl0bEWOJHnx9kJElELSikmwtKFPss0FeMsuWpQIuhqsZWTyyRyrd99o21DQO62esz YOuK5WsPkfHa0GWAg6fvFEEihUwe2qS4mqA0O+ZOfLSZ3B3VjA3d6q+SRENQkyaR5FnE /ghw== X-Gm-Message-State: AOAM530BMPLDFycjgWcug31/5alVb3f0LBDUrTYtlDYTmwQyLkV6NNBq Q6oCfRJGdagZkfQTx63r0h2+8T9VC9k= X-Received: by 2002:a63:471f:: with SMTP id u31mr6728332pga.85.1625340698762; Sat, 03 Jul 2021 12:31:38 -0700 (PDT) Received: from localhost.localdomain ([191.84.237.8]) by smtp.gmail.com with ESMTPSA id r21sm16356529pjz.12.2021.07.03.12.31.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jul 2021 12:31:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Jul 2021 16:31:02 -0300 Message-Id: <20210703193103.706-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/setts_bsf: actually store the current packet's timestamps to be usable by the next 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: GkZ9zKLjYMeA Before this change, the PREV_OUTPTS and PREV_OUTDTS constants always evaluated to AV_NOPTS_VALUE. Signed-off-by: James Almer --- libavcodec/setts_bsf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/setts_bsf.c b/libavcodec/setts_bsf.c index 2558e38f51..1e43036ee1 100644 --- a/libavcodec/setts_bsf.c +++ b/libavcodec/setts_bsf.c @@ -171,10 +171,10 @@ static int setts_filter(AVBSFContext *ctx, AVPacket *pkt) new_dts = new_ts; } - s->var_values[VAR_PREV_INPTS] = pkt->pts; - s->var_values[VAR_PREV_INDTS] = pkt->dts; - s->var_values[VAR_PREV_OUTPTS] = new_pts; - s->var_values[VAR_PREV_OUTDTS] = new_dts; + s->prev_inpts = pkt->pts; + s->prev_indts = pkt->dts; + s->prev_outpts = new_pts; + s->prev_outdts = new_dts; pkt->pts = new_pts; pkt->dts = new_dts; From patchwork Sat Jul 3 19:31:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28748 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp2752373ios; Sat, 3 Jul 2021 12:32:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwATO7lRIaSBiHzZIl/SJdVMxFNNYIkQJzgaGeK6GQ3jgvRK7j5vKfL4k5vaZlbX8Wj8Mfs X-Received: by 2002:a17:906:388b:: with SMTP id q11mr5815538ejd.43.1625340720519; Sat, 03 Jul 2021 12:32:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625340720; cv=none; d=google.com; s=arc-20160816; b=cd1uhwVF9iXXZnmF8kWi3wLVnSB6LhIfN/CFakWB60hcGVSuxb+u8pQkMdAXwc23kP 3CpZ1mWK50eE15Opd03JC5Ah3ZxtjxytZI2kgwuMlAjM8QTg2A4E9JBndY1b2SlVMO13 7/s6iZHsoPrtQZD6O4bEWx9dkd/0yYjxU82FMcUzMeKkzPnoj9rikxE8kuiYR5A7Bqkv xu9/kWpX4pZWeiab2OffX2YqWS7NWaxtFxY9WzqGHpyP7bsTbZ/eLTazNliaTOvFE0ys BjNevi/KbVEZLqObCG5myx/Vg+im1m2SQnl1Y098RMN2Mg0CjsvUxpbddC8NY4qAuMIw vLLw== 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=+8pNyJ53T/yfnMTePE64jpXgwMjvyEraxcVaD3IZybw=; b=axyaWF/3jRVS4JbRxln1UEMwBCeXcnZUMC7O8p9apMfWJH/p7b7UWA8WpPvubmPh+d +DGeFWreSE4bbKXJ6mXMWWL73J9gu5/SBJBhabUuJ+ewGojU6wjPYdcclgy+CXj8uSb3 JuUg+l2xmqhwUbuGuX8/eYbfIVDZXVI5Ka+gnE5zYcSj+1eDYFTF8k/dJvtdLBIQS61t aKc5Ez/TZaBFTTg3A2TRD/qUvmzST5QfrOskU86UyC2BTatgC+4DjuukvwHO7j/qfRP3 6IJ20AFJK0p3nbFwn+H4E1GSZ/jVq/+WC4RjKfgwBgVBfc+ddki+DLXYUlzkfagNqyzi 2HTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=p6h4kfdk; 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 a2si6636370edr.530.2021.07.03.12.32.00; Sat, 03 Jul 2021 12:32:00 -0700 (PDT) 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=20161025 header.b=p6h4kfdk; 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 6CAD168A04F; Sat, 3 Jul 2021 22:31:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED5A368A04F for ; Sat, 3 Jul 2021 22:31:41 +0300 (EEST) Received: by mail-pg1-f180.google.com with SMTP id g22so13748462pgl.7 for ; Sat, 03 Jul 2021 12:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ARP41JjIVyiKHs9C1pyDjOxzqCjdj8HbqYUzha9pRrM=; b=p6h4kfdkw1u0jMbY/qbdaD9fabyHYrZznYuw/FZfKN11JQ0qilYyJFnsKXaWKfctB3 SS4G1zBCT4EnxFWrQdZVOK39OWRa5k5ujm+W5vKDqn7hooOZFaaGRn8eQBmsLtlN35hC OQAf02aeov0l5jEPA6yfM+5dvX749qjqyIiJ1P2b3PP/CrPr4LqILc0a6AiaBYHnloK1 f4xIWwU8ibsIoRKE8z+sp+4hRpgInI1rQXaIgSwFk/ShoSL9f0LlstF1H+Ma8KvBymXH 381Qb1/LEKa0sI6GeIRz+WC0pNlRN3vGby1+WnykJc/+rJlYKlqxszx9nwV3VeiqcEkR WFBg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ARP41JjIVyiKHs9C1pyDjOxzqCjdj8HbqYUzha9pRrM=; b=ID8PUD3LpZMk3qzDiyMPjbBbMfJCfvCKEuwK2ka2ldIktltTQNbz3KVhFTS15K+GuC Hd4o5pNcOCBE1RyscwqDgNMT+vz9fo9r6yzlysW+vh17Jzp8Yyd4oXAirS5tLtCuS/0V fOMbUkUPcpzKAXprR41pLuTo13imW9SW5g0MLOWKdDPByLyzYSimxfWYSrdTPaddiTxH +Mcaaps5+HpAesYHG7CZVDp/RkjdE0+NoWxFSoLZnjyWDwx6M1hj/4DrIs/oRnFZqzWZ pbax0cEsg+zI4+l1ACd4D8NA2zjpHa1Q/myvBd0Ks8Tjkw5+GeNbd/h6mPID/ECnLI95 r7hw== X-Gm-Message-State: AOAM530Qf3An7jWQmr+wciiKc03ay/Hr2SPN3tVX8up17b/nDA1/AL0h +GiS6L0MEfPW6+IfMeROzWGzSJpWzIM= X-Received: by 2002:a62:2bc6:0:b029:2cc:242f:ab69 with SMTP id r189-20020a622bc60000b02902cc242fab69mr6471395pfr.16.1625340700026; Sat, 03 Jul 2021 12:31:40 -0700 (PDT) Received: from localhost.localdomain ([191.84.237.8]) by smtp.gmail.com with ESMTPSA id r21sm16356529pjz.12.2021.07.03.12.31.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jul 2021 12:31:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Jul 2021 16:31:03 -0300 Message-Id: <20210703193103.706-2-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210703193103.706-1-jamrial@gmail.com> References: <20210703193103.706-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/setts_bsf: add a NOPTS constant 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: wOfTJaB/WePC Signed-off-by: James Almer --- libavcodec/setts_bsf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/setts_bsf.c b/libavcodec/setts_bsf.c index 1e43036ee1..d7d13d2652 100644 --- a/libavcodec/setts_bsf.c +++ b/libavcodec/setts_bsf.c @@ -44,6 +44,7 @@ static const char *const var_names[] = { "STARTDTS", ///< DTS at start of movie "TB", ///< timebase of the stream "SR", ///< sample rate of the stream + "NOPTS", ///< The AV_NOPTS_VALUE constant NULL }; @@ -61,6 +62,7 @@ enum var_name { VAR_STARTDTS, VAR_TB, VAR_SR, + VAR_NOPTS, VAR_VARS_NB }; @@ -121,6 +123,7 @@ static int setts_init(AVBSFContext *ctx) 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; }