From patchwork Fri Jan 1 12:00:58 2021 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: 24731 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 66D6944BBFF for ; Fri, 1 Jan 2021 14:01:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2755168A7E9; Fri, 1 Jan 2021 14:01:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D970668A68F for ; Fri, 1 Jan 2021 14:01:11 +0200 (EET) Received: by mail-pj1-f47.google.com with SMTP id z12so6071936pjn.1 for ; Fri, 01 Jan 2021 04:01:11 -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=my3yqC4Rv++7J/MubijpRryC6mzUufigXsOE2tw2hUE=; b=RBvXWFWhDs8sqY9AFxiqSv6az6E3wJITSgJhJnbs91FLCvUj3dh62Q05eSDQfDrRrf znGr+0n6/N4aQTFuNv6B968o/2Owya6dOh8+DcLoeZ5HflsKYwzwrTow7qS0bpa96es/ 5BACnWTgxPtg6VMnu+LllKj3UT8P6lGF8+cGzxx5gxDC0v4PmxBx5LrE3h0C5kJvJZVP 8yvCosQ5YVifE4exueDuydQ+nhb1oJRVVmpsngSAodTg0F/KaJAOGVyjF22XGJEdEg3k es1QucVwWRC/6lnH/6d4avLQ+YxTdSGdDAszdf11Rh3C7oPXoJScJrm2emg9S0pzC1lJ Nq5A== X-Gm-Message-State: AOAM531MkoirnSSCJ6y74Lq7ysxHgEfPGkkWaWxLLUI4txCw7PUtZkdn Pa+n342F0Bm8kUFjhkBYVN/MLY09H+78IQ== X-Google-Smtp-Source: ABdhPJxYq6N2h+ovaFC2td6rM5gB+yEaS5IH9Qai+RTBiD5lMoMXdSa+Y03imTtdiyyP6Iblw4MLgg== X-Received: by 2002:a17:90b:4a0c:: with SMTP id kk12mr17339774pjb.205.1609502469691; Fri, 01 Jan 2021 04:01:09 -0800 (PST) Received: from SMARSUFAN-MB1.tencent.com ([103.7.29.6]) by smtp.gmail.com with ESMTPSA id z11sm49332827pfj.191.2021.01.01.04.01.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jan 2021 04:01:08 -0800 (PST) From: smarsufan@ffbox0-bg.ffmpeg.org, smarsu196@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jan 2021 20:00:58 +0800 Message-Id: <20210101120058.21303-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 Signed-off-by: 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