From patchwork Wed Sep 28 09:32:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp83056pzh; Wed, 28 Sep 2022 02:34:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM52VVlLFXu9cxS4sR9stteENTgrJpN66NMlnXTx6AIKEH6Sk0pSqUfIpT5IWM6j9wsuEqzh X-Received: by 2002:a17:907:2c77:b0:77b:4445:a852 with SMTP id ib23-20020a1709072c7700b0077b4445a852mr26554041ejc.582.1664357665605; Wed, 28 Sep 2022 02:34:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664357665; cv=none; d=google.com; s=arc-20160816; b=awaqDWm+rH+JHnN+B5bx9kbuiw4AgnDpblq3x+ONdkRu32pkty/8i9w4nWgv8T/Csk Tgo02kjmoZg66sbYjoCrUC35pz1+Cucec4ELhXjohPREX5bTEOgBcWY7G9PSrVYOo9zt b33Mh4gbk/z09zClKDWW7i3nWqtsHLWv37im7R2LU4ROQ0+58xjuo3GcHWti+SuHXr5W 1FwR2xN96t+zDzHf4xY9xHSPMPLNgV1FmnCZcmIt7I7Xq9UIm3TSrTwiA/6E22JOjM7Z E0djYThVZJeYZjQgy64npnKGw5CqYum/oe8aibmoMR37ej9N/HoHUu9D01KUSr7BQM3q ci+Q== 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:delivered-to; bh=nVxnxKsHrbmtAB2CyivcqGIa9kSsAbsbp9j/L4nLpiM=; b=a4QJfmYGiNVdM7CEkivHi2wBd+Tg6s5xCOYolBFZAzqn4IsuOdoEP3UJNUoNJz/LEg lyftcE4bd/9XIczzUmHo8IV9zOJUWh90DZizclf7oGSALMVVseUUgRC9A5Lq7pMcmkUY SknXWDUnGCwChq0mA6uNNX0qUBe+w/jjj/YcQj9CODc/vPAdKEy37GxAfOuutcafhiMR GCYeXqRT9CizDL7Vlqe0hpqUf/awt044UHmjnnHzjjV4a4IpRrBUoq4kvgdRXjWFJ0f8 s5aIZH8/ptIcsKbJma3RXOlLf48L/pKI55dxTxvSmCIm/X6m4DOUj4b+4WvD1ZRbcFZe Kr9Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ga29-20020a1709070c1d00b0073db9474d06si5221892ejc.325.2022.09.28.02.34.25; Wed, 28 Sep 2022 02:34:25 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7FDE68BBD2; Wed, 28 Sep 2022 12:34:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4ADF268B7FF for ; Wed, 28 Sep 2022 12:34:07 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id BEC38240183 for ; Wed, 28 Sep 2022 11:34:06 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id GqvPisCvm3FZ for ; Wed, 28 Sep 2022 11:34:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E5D4D2404E4 for ; Wed, 28 Sep 2022 11:34:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id F0B003A0D7F for ; Wed, 28 Sep 2022 11:34:05 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 11:32:13 +0200 Message-Id: <20220928093213.947-3-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220928093213.947-1-anton@khirnov.net> References: <20220928093213.947-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/encode: combine setting no-delay pts for video/audio 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: tVsKfNjyOq5H --- libavcodec/encode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index fb3ab0db3c..a1bc10fa3a 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -209,13 +209,13 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt, av_assert0(avpkt->buf); } - if (avctx->codec->type == AVMEDIA_TYPE_VIDEO && - !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) - avpkt->pts = frame->pts; + // set the timestamps for the simple no-delay case + // encoders with delay have to set the timestamps themselves if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) { + if (avpkt->pts == AV_NOPTS_VALUE) + avpkt->pts = frame->pts; + if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { - if (avpkt->pts == AV_NOPTS_VALUE) - avpkt->pts = frame->pts; if (!avpkt->duration) avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples);