From patchwork Mon Dec 28 03:20:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: smarsufan@ffbox0-bg.ffmpeg.org, smarsu196@gmail.com X-Patchwork-Id: 24663 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 784044486CC for ; Mon, 28 Dec 2020 05:49:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D72D689A28; Mon, 28 Dec 2020 05:49:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 823D9688140 for ; Mon, 28 Dec 2020 05:49:52 +0200 (EET) Received: by mail-oi1-f181.google.com with SMTP id s75so10409386oih.1 for ; Sun, 27 Dec 2020 19:49:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KywX/q8tr90YGuXl6EPFSDld64T9VlPuzSGOZFcIN24=; b=WaTrG+76QgFd42HnYBD4bp6oorIikPMROoGupUKfZKW9AEwhJ3VBA8dOv+FrR44//l dnDFyW+GGYpMUKVwkhEZWL4ZA0bwpLyMKIOCPdOSYNrmrz0KIyKtkS9DZIpEtPknwEKL JPEq1lUgCziZys4vHudtgpwOeX/PPNlcStHw+FnABl0ZDnZYeMlknEO/4EGfW9q+Uh/z 8Krutt7u2449bMMoO08uz44MWP5ZMKwNYN9n4K0KG4gVVI3l9NIOyMosoL+YFRii4i6U BzuweqHik16SJ4TL70QqW8Aiyho6nrhuLPpxRySIYWbfMnXbr8dFsilvzKw6Dfa2CunL 89Zg== X-Gm-Message-State: AOAM531hJmkG5SS1REOdhLgCaxu0AiSCwHsQYv4Oi8ze+72jnHJveBVX UiC+u1VKk/Om5XzY99RmYRxxPWbn/VQZIg== X-Google-Smtp-Source: ABdhPJxK5A6ZXLxCjFpe0wrjMFvUsvKrF205fT1D6jg9S9G1GsiwfOh6wLtBr9LgKRVL2sKa3LC0gA== X-Received: by 2002:a17:90a:66ce:: with SMTP id z14mr18743672pjl.153.1609125635035; Sun, 27 Dec 2020 19:20:35 -0800 (PST) Received: from SMARSUFAN-MB1.tencent.com ([103.7.29.6]) by smtp.gmail.com with ESMTPSA id 145sm32464134pge.88.2020.12.27.19.20.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Dec 2020 19:20:34 -0800 (PST) From: smarsufan@ffbox0-bg.ffmpeg.org, smarsu196@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Dec 2020 11:20:23 +0800 Message-Id: <20201228032023.3103-1-smarsu196@gmail.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mux: rewrite guessing the packet duration 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 Cc: smarsufan Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: smarsufan --- libavformat/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 84c56ac6ba..3356ba6bf5 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -620,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