From patchwork Wed Jul 13 09:17:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36772 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp226020pzb; Wed, 13 Jul 2022 02:18:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sJ5WguYGs0yHdN+bCMbrF+koBm8UkhlNi2csf0Mm1iQPAHURL/MeKjrjWqsMAJ5duVGuz7 X-Received: by 2002:a50:fd93:0:b0:43a:71e2:781e with SMTP id o19-20020a50fd93000000b0043a71e2781emr3476636edt.396.1657703916359; Wed, 13 Jul 2022 02:18:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657703916; cv=none; d=google.com; s=arc-20160816; b=nVju3ciE7Cwvp5l6VYV0erSkyHpHMbnw/78Tr0lC2i8nWTZVWmyq75e394jo4W/cNb gelzgsxhyFqwgG1ycyYWR1d2cCBmEdmeFfC/h8ZcPT+S1ik2KSg3Tp1wpqP3tImtMAMT vxlW2gc+Q9lrTus6dg6nItxZyPsCFsOQDsLhEXNnee23Ih8cekLYA+S81hd5OnKKkOqN FqM8SNkZOlzt7On7L2lOBVieGCC930Nf4Ssoj8V2gKXvlObYtIBmtfy5bzHGUI10dI7L Pk2NeHy26Njv7pWsQsvxOJD/DXNbikhgkyd/sIx2pRGUXPPtPOcvUnbF+9h6fXnUENdL +SwQ== 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=J8w46iIS/L4qVR/CJ7QoApiQbPgHtSAWz6gOnyUIUp0=; b=EfRgFFe/fsyWP7cgoVf03W79RFnpdsSZeKVJPj2ozahyVRxRMo2wNu3hdP7VszvX8s WPdBUaOGdBsHzyMWaKANOnXCqrj56/dZcPWvV+68BYdkX0kvTO+yUGIthSgokVZ3pGMc 19mq/Zit9EVn+8oVFrA14iWgwbOmUGNV2RBtyK3ulYPw8AeEdaDPKTZ8YyGs2KZ9o3xN l7u7fygYWRlxEm63qZHQ9Oj6CDQRhKgsmTnNjp0mYCcHvlZIeo6cI2qokdLoOJyJVc49 UaxgVVhLCZ9bAEZgBk6z3ec5+f+u8XYDx1iG2g+RcjEY5ZlqfegT7MBGIsHhk++qxbQK 9RyQ== 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 dd10-20020a1709069b8a00b006ff17ba1a4dsi19505124ejc.275.2022.07.13.02.18.35; Wed, 13 Jul 2022 02:18:36 -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 5803368B95B; Wed, 13 Jul 2022 12:17:43 +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 EDCD568B8B9 for ; Wed, 13 Jul 2022 12:17:36 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id BB718240507 for ; Wed, 13 Jul 2022 11:17:32 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id vioP9ksumgi9 for ; Wed, 13 Jul 2022 11:17:31 +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 8E19B2404FE for ; Wed, 13 Jul 2022 11:17:28 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id D96783A0366; Wed, 13 Jul 2022 11:17:27 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Jul 2022 11:17:21 +0200 Message-Id: <20220713091725.16638-5-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220713091725.16638-1-anton@khirnov.net> References: <20220713091725.16638-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/9] lavd: use AVFrame.duration instead of AVFrame.pkt_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: MQNrXrcwmPnJ --- libavdevice/alsa_enc.c | 9 ++++++++- libavdevice/pulse_audio_enc.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libavdevice/alsa_enc.c b/libavdevice/alsa_enc.c index ac09e33c49..e461829d03 100644 --- a/libavdevice/alsa_enc.c +++ b/libavdevice/alsa_enc.c @@ -131,7 +131,14 @@ static int audio_write_frame(AVFormatContext *s1, int stream_index, pkt.data = (*frame)->data[0]; pkt.size = (*frame)->nb_samples * s->frame_size; pkt.dts = (*frame)->pkt_dts; - pkt.duration = (*frame)->pkt_duration; +#if FF_API_PKT_DURATION +FF_DISABLE_DEPRECATION_WARNINGS + if ((*frame)->pkt_duration) + pkt.duration = (*frame)->pkt_duration; + else +FF_ENABLE_DEPRECATION_WARNINGS +#endif + pkt.duration = (*frame)->duration; return audio_write_packet(s1, &pkt); } diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c index d5928e2b3f..038401c680 100644 --- a/libavdevice/pulse_audio_enc.c +++ b/libavdevice/pulse_audio_enc.c @@ -686,7 +686,14 @@ static int pulse_write_frame(AVFormatContext *h, int stream_index, pkt.data = (*frame)->data[0]; pkt.size = (*frame)->nb_samples * av_get_bytes_per_sample((*frame)->format) * (*frame)->ch_layout.nb_channels; pkt.dts = (*frame)->pkt_dts; - pkt.duration = (*frame)->pkt_duration; +#if FF_API_PKT_DURATION +FF_DISABLE_DEPRECATION_WARNINGS + if ((*frame)->pkt_duration) + pkt.duration = (*frame)->pkt_duration; + else +FF_ENABLE_DEPRECATION_WARNINGS +#endif + pkt.duration = (*frame)->duration; return pulse_write_packet(h, &pkt); }