From patchwork Wed Mar 24 04:03:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26584 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1837B4479A5 for ; Wed, 24 Mar 2021 06:04:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0EBA68AA0D; Wed, 24 Mar 2021 06:04:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86E4568A1E4 for ; Wed, 24 Mar 2021 06:04:49 +0200 (EET) Received: by mail-qt1-f171.google.com with SMTP id j7so16668885qtx.5 for ; Tue, 23 Mar 2021 21:04:49 -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=zloRLAe1MLA8ebNDDDRLpHsdWTWqOwMRgIsNe9LyJCY=; b=eBlTPH270zCpK1Jk7Y6o4BSuqYW2QfdPGzMNQzFR1PZ21EaNSkMigqzG2KKaRk5tnP uaVFewioOnI98UorRyPPKF3mzSFQM8JaI2Q34SXvT2V1VEedIxtIiKtr3rhyznGFJp5p alLX3uRut3qs+YEkYa3MsXF5qoaUFbMTsiULIYvKNlFB63tSakmas17HgnCsaKiiuMDI 3U0bNV0YOcKs6V9qWyBwx1B41SJvmJ1kx942IPwyvD92sydh2kNg9/MAO2GQkUhTRqrb ZT7HAHOj0PRB88MfKSpJKr5jnreO3LfrDIOiQNXYaz+E92CL+9HNvusAcQdhUZrawq+n iH1g== 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=zloRLAe1MLA8ebNDDDRLpHsdWTWqOwMRgIsNe9LyJCY=; b=d60vMfF0v8vseFspbp4nc22Nk58e533Y2HpkuGrEBEO7r6B5n44MeAWVCi2tbPrPYE wP8opCUKdC4tDkC31+KLpWfdVuVhkIQY0urV7/YvGBYYkVskECWz6yfpCnoanoqqrZTR s6766bzJrSFiFgKrGWv4U9tp4UQB9hY9pomYi8lqZCzLtPqaHNxrINVRwkdDNB0RhaA9 oNGLajM3IruS0CcMoQGFP9Q3AefzgOFMOWYOdt7LThL6RkAM/5D+RxWbkemhdB7x7rkf BWoGwoj0q3slDRYM5WH3pWcI4oY7k9UlqSfENc6OdBE8PU4N7SDdo0zk4n4o6DO3/ASf 9LGw== X-Gm-Message-State: AOAM5336yqRSClG5GVESaEscbCemSCe0J5AbQZN9JGodzB1lCY+UO5ej a6r4AdrC22i17DR43H9DCt4uIBKGfOY= X-Google-Smtp-Source: ABdhPJzp8pnXTlkWTAOYQAFd4u1Cc4d3TpUo7Pn1BSM3jLi2C26dwD550n1Xp8aoGCLcP+6ZnIn38Q== X-Received: by 2002:ac8:6e85:: with SMTP id c5mr1303185qtv.299.1616558687660; Tue, 23 Mar 2021 21:04:47 -0700 (PDT) Received: from localhost.localdomain ([181.23.86.39]) by smtp.gmail.com with ESMTPSA id b27sm790788qkl.102.2021.03.23.21.04.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 21:04:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 01:03:56 -0300 Message-Id: <20210324040356.55602-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mux: use av_get_audio_frame_duration2() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" This removes the only use of st->codec in compute_muxer_pkt_fields() Signed-off-by: James Almer --- libavformat/mux.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index e98b86a81e..5d907cfaee 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -541,8 +541,7 @@ fail: #define AV_PKT_FLAG_UNCODED_FRAME 0x2000 -#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX -FF_DISABLE_DEPRECATION_WARNINGS +#if FF_API_COMPUTE_PKT_FIELDS2 //FIXME merge with compute_pkt_fields static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *pkt) { @@ -621,7 +620,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * case AVMEDIA_TYPE_AUDIO: frame_size = (pkt->flags & AV_PKT_FLAG_UNCODED_FRAME) ? (*(AVFrame **)pkt->data)->nb_samples : - av_get_audio_frame_duration(st->codec, pkt->size); + av_get_audio_frame_duration2(st->codecpar, pkt->size); /* HACK/FIXME, we skip the initial 0 size packets as they are most * likely equal to the encoder delay, but it would be better if we @@ -636,7 +635,6 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * } return 0; } -FF_ENABLE_DEPRECATION_WARNINGS #endif static void guess_pkt_duration(AVFormatContext *s, AVStream *st, AVPacket *pkt) @@ -779,7 +777,7 @@ static int check_packet(AVFormatContext *s, AVPacket *pkt) static int prepare_input_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt) { -#if !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX +#if !FF_API_COMPUTE_PKT_FIELDS2 /* sanitize the timestamps */ if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { @@ -1140,7 +1138,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt, guess_pkt_duration(s, st, pkt); -#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX +#if FF_API_COMPUTE_PKT_FIELDS2 if ((ret = compute_muxer_pkt_fields(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) return ret; #endif