From patchwork Wed May 17 10:19:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41676 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1079363pzb; Wed, 17 May 2023 03:24:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5a0DG2iCBy5xmHjbHfGelYU/TL1qOzxqUiHtQlxKM0QsxL85H3iuInMei2qXQS+USn6TIQ X-Received: by 2002:a17:907:5c5:b0:95f:56e8:1c3c with SMTP id wg5-20020a17090705c500b0095f56e81c3cmr37658309ejb.17.1684319041315; Wed, 17 May 2023 03:24:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684319041; cv=none; d=google.com; s=arc-20160816; b=MhBd9KWoepveztW9mkAR4r3sU0QjpjAW8+xQZxltZfydAqU7b/5Gh4jgRFFms3dcAZ USYDEHK8gz1mOioHnCCPhytS6478REyKGHqf/raHwwI0bnHucz4GDonmLtgzRqqcAiFV tLpSmDXevvg+pC+nzi0RkSjKI7benM0vCsYEYZFqxW49smoeO1t5pNb9kH9j210T3hlD vMp7OpTzi6gDG8O7oKZhi4XxxdP79VcomHK+kFkKqmo+Y38ZWc2oMZWOVqOpV+Vt98Jp 28CBzAv8P+sUKUPEQSWl+mgFEGv/LHeY1fyesvLXFBO5fyq+IQ3r6uylPFbFdve6DxN0 gZhQ== 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=uieWWXObBu3LyphC84gmkcfkpWgruCSjhaDj1PB8Ksc=; b=u1qywZABOuAWP6Da0iXMu24PGKqUJklaHvUhsvobCkIrhZZD64LTqEvZqXrANb48j7 AXTAZ8NFDgbvXO80EZmdilAaUuuq299K5NYTKBe80NzJARe2kYxZ0UaIliM4+OathypJ VZ2GVn5NQR2IKQZu2Rokobf5Q39oXpd9LjzT6/CovdBXpGPL3Bey3dvCA8DnPKc5mMBZ B9tOGU8kUZlTITXQFnEG+XIpFhvDmNKR9xvIweSFSGehcG2uMvZ2cz5IXpLgsgFLp6YL tLeqqX3PJdLkWAb9HMJvod/gbSl648uLaD1w7AOgDu+5S8QziGU3lfQHMMi9/vkViltq CNLg== 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 d22-20020aa7ce16000000b0050db7e5fdd4si15042890edv.245.2023.05.17.03.24.01; Wed, 17 May 2023 03:24:01 -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 878DB68C1B3; Wed, 17 May 2023 13:21:13 +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 0868268C14F for ; Wed, 17 May 2023 13:20:53 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 141152406CB for ; Wed, 17 May 2023 12:20:51 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ZAKJtxAWvgjr for ; Wed, 17 May 2023 12:20:47 +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 E16C92404F8 for ; Wed, 17 May 2023 12:20:45 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 9085B3A1251 for ; Wed, 17 May 2023 12:20:39 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 May 2023 12:19:58 +0200 Message-Id: <20230517102029.541-5-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230517102029.541-1-anton@khirnov.net> References: <20230517102029.541-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/36] fftools/ffmpeg_filter: make sure pkt_duration matches duration 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: 5Do2eYHveIT7 Otherwise the two values might get desynchronized and lavfi can prefer the wrong one. --- fftools/ffmpeg_filter.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 95ffa0f087..274eefe11c 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1622,6 +1622,11 @@ int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_reference) frame->pts = av_rescale_q(frame->pts, frame->time_base, ifp->time_base); frame->duration = av_rescale_q(frame->duration, frame->time_base, ifp->time_base); frame->time_base = ifp->time_base; +#if LIBAVUTIL_VERSION_MAJOR < 59 + AV_NOWARN_DEPRECATED( + frame->pkt_duration = frame->duration; + ) +#endif ret = av_buffersrc_add_frame_flags(ifilter->filter, frame, AV_BUFFERSRC_FLAG_PUSH);