From patchwork Wed May 31 15:32:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41931 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp3357017pzb; Wed, 31 May 2023 08:32:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6iIAwXI4R3hgGPYMvypIb7WRpKuT5vW6Tt45DgghOJ8q4LXb2sZM7taSxa7mtdzK3cGJVs X-Received: by 2002:a17:907:724a:b0:957:12a6:a00f with SMTP id ds10-20020a170907724a00b0095712a6a00fmr5258630ejc.21.1685547151893; Wed, 31 May 2023 08:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685547151; cv=none; d=google.com; s=arc-20160816; b=BA0N1zStvGWD/GZ9TyiLndU4PPqNaIRhYxYAT1/cUVxEGHKQcrtxV4NscSit3E0p+k 6tXVUa5tgekTZ9gYoFdk+qlu4CAblziL0nDfvljfAsEsVGxdAOlLuDglWWM3NMHC3y1q tenC0+N31+GDSRmdfysdez7xwcSnMK2LN2lE3SlQWuwSKuV15w/yb0So0V0oA81Zl/RD pjyrCMnSwjdOzK4paC4AEWXg/hTloYjrrmK2rmdbBcIDoCjEaTnq+oParhTMI9trKE6H sjrxV71oJaKhtKaGU0r3agUjhyu2IWKcVuLxUJ+C7t6mt7rtIiNhvzqc0Isej0P4mKAo bUCA== 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=makMftolKfrZ3rpc2vfX5A4zzBJHx6YiD0UenkJjO9w=; b=V7TjWAOyNF7tN7vEgx2RYrqwzzoTMOoAFJ93GC6dYESBywaykzx+QytIWsnq09FDvp 321mAa9EHmzEgYoYgkztZSgqtV3tFORX/eIweIHSfD7zbWTaO2tbX4c+/38PnGybDZkf XnBHo/miPh5KOM1Iyu6p3NsOMFXeV5ksb9Sgtt5f/5DXrJXMurT3K0s+u9/phd5CF/yv /45jiuudtkns7mEQ3VJ3c31zECn9PBH/GBbK1Jd4tV4luaGmVDIWxytTv08Y8m2cAOp3 2enaefz0VxzsUcPttvC0eskxUvbP21LvU/nYfjgjp3stOxF+h2siiiwdTP3Wh9AzfTH/ Dfmg== 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 h21-20020a170906719500b00969c3b8ff16si2127195ejk.741.2023.05.31.08.32.31; Wed, 31 May 2023 08:32:31 -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 E0DB068C29F; Wed, 31 May 2023 18:32:18 +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 1995968C1D5 for ; Wed, 31 May 2023 18:32:11 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id CF3312404EC for ; Wed, 31 May 2023 17:32:10 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id LlXFsJRopYci for ; Wed, 31 May 2023 17:32:10 +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 A9F492404EE for ; Wed, 31 May 2023 17:32:09 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 66AE23A04D0 for ; Wed, 31 May 2023 17:32:09 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 May 2023 17:32:05 +0200 Message-Id: <20230531153205.24424-3-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531153205.24424-1-anton@khirnov.net> References: <20230531153205.24424-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] doc/examples/transcode: convert timestamps between filtering and encoding 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: bPpsQy9q1J1+ The timebases do not have to match. --- doc/examples/transcode.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/examples/transcode.c b/doc/examples/transcode.c index 2e1491f432..ebe5ad2a42 100644 --- a/doc/examples/transcode.c +++ b/doc/examples/transcode.c @@ -439,6 +439,10 @@ static int encode_write_frame(unsigned int stream_index, int flush) /* encode filtered frame */ av_packet_unref(enc_pkt); + if (filt_frame && filt_frame->pts != AV_NOPTS_VALUE) + filt_frame->pts = av_rescale_q(filt_frame->pts, filt_frame->time_base, + stream->enc_ctx->time_base); + ret = avcodec_send_frame(stream->enc_ctx, filt_frame); if (ret < 0) @@ -493,6 +497,7 @@ static int filter_encode_write_frame(AVFrame *frame, unsigned int stream_index) break; } + filter->filtered_frame->time_base = av_buffersink_get_time_base(filter->buffersink_ctx);; filter->filtered_frame->pict_type = AV_PICTURE_TYPE_NONE; ret = encode_write_frame(stream_index, 0); av_frame_unref(filter->filtered_frame);