From patchwork Tue Apr 28 03:49:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19297 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 3075344B11D for ; Tue, 28 Apr 2020 06:49:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 031A668BD50; Tue, 28 Apr 2020 06:49:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 563D768BC5D for ; Tue, 28 Apr 2020 06:49:24 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id y6so537793pjc.4 for ; Mon, 27 Apr 2020 20:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=EATQjA1SjuEQJidhmWAaBRy+SGkgRlU500bLeDb/sKg=; b=M9hQbSCzxddehD7ehr5OCse+qg9LAIk8sjf6OROqU3TOwsgjJwohF7Fy000C808Cgr eMHeBnOVAogCcVkFgGIEpoSBF1mEQ8e+SAwaF2vpkOe5ag8I0qnctQaqzMbN5kiw2RLL rDMjNRiP6hD35p8KaknmXFrRYlqOl4Jo/uVlVo6/nzF7dQcIP2N4zn7cxCSseXw5L4/I gCtTGYAzW60GrfbhZMl/z5zv80sSspHzLFpzoE+sPcHdp2zdxrL8gEdGB7sjR77bfPkJ t0Ggn/pZj90oFKr1WXjmKnuxFdhZY/vHMP7BSVktdvAVgFEFq1+dDJjqpEOAWaHRSeMT 7kXA== 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; bh=EATQjA1SjuEQJidhmWAaBRy+SGkgRlU500bLeDb/sKg=; b=aZC5e4If+QQVTjy26fN8bwBhsXYUsC6rDgeLR+mRghl3z7JS4Hldmdz0mSGXFyFh5R 3SGY+FQqqnhXHIaddRUllWdEh8vRiUP3qxYUaU317BxpmPSWliPNqNWo+cfCGisMo+lF 4ZJyqtdBYb23kICEh/q9jbo8e/XyVpLtToj0zBzvseElmLapgPPq7fSCRXKmN6ydocD1 vEMrLgtaYbmfeZTioTBZeD1d74ZQfbWkh037+dIR4rmQ9Zx8JxdcLm1FpJsAL3dA48xQ d58A6oBJv1XOdQtu1bZm85Yv9PMApaz5qAbGU++V0Bkv1hdfSVIvNA+Y7BnV9r7kDgbz G3Pg== X-Gm-Message-State: AGi0Pub31P1D3yXPXotMVLiXiT4/ssbeeRXEdB/MrKKQLklu+uI9oKji dd5608vtglaICJ1E5dOZWytgRSy/ X-Google-Smtp-Source: APiQypIN2SZW+qehHYBqbIcxPPGVKgnXFG2u/y+sj0KZ57PK6l/IP3lRXfHKupyKfaW1JjK5c0A78g== X-Received: by 2002:a17:90a:8c83:: with SMTP id b3mr2511270pjo.141.1588045762284; Mon, 27 Apr 2020 20:49:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id p189sm14095506pfp.135.2020.04.27.20.49.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Apr 2020 20:49:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Apr 2020 11:49:16 +0800 Message-Id: <1588045757-25182-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/vividas: simplify, use av_rescale_q() instead 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang note it'll cause a small difference in accuracy for the pts, please see the testing result below: $ wget http://samples.ffmpeg.org/archive/all/unknown+unknown+unknown+unknown+5029_paramount_en_1250.viv $ ./ffmpeg -t 0.04 -i ./unknown+unknown+unknown+unknown+5029_paramount_en_1250.viv -f null - old: pts: 522 pts: 1044 pts: 1567 pts: 3918 pts: 8097 pts: 12277 pts: 16457 ... new: pts: 522 pts: 1045 pts: 1567 pts: 3918 pts: 8098 pts: 12278 pts: 16457 ... Signed-off-by: Limin Wang --- libavformat/vividas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index 4f54a4302e..b0f9f35ac2 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -646,7 +646,7 @@ static int viv_read_packet(AVFormatContext *s, pkt->stream_index = 1; astream = s->streams[pkt->stream_index]; - pkt->pts = av_rescale(viv->audio_sample, astream->time_base.den, astream->time_base.num) / astream->codecpar->sample_rate; + pkt->pts = av_rescale_q(viv->audio_sample, av_make_q(1, astream->codecpar->sample_rate), astream->time_base); viv->audio_sample += viv->audio_subpackets[viv->current_audio_subpacket].pcm_bytes / 2 / astream->codecpar->channels; pkt->flags |= AV_PKT_FLAG_KEY; viv->current_audio_subpacket++; From patchwork Tue Apr 28 03:49:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19298 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 2DCA044B11D for ; Tue, 28 Apr 2020 06:49:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1406168BD62; Tue, 28 Apr 2020 06:49:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0197968BCCB for ; Tue, 28 Apr 2020 06:49:25 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id a31so537707pje.1 for ; Mon, 27 Apr 2020 20:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KUMnWfyPXDU2HdC3qB5Gs6KsZayVM5HgW78NIo1PgXk=; b=ny6qCpisMo6V+prTMbQrB82nMzCK9q4LDmZbKjGCh+I4np9mzZE355J97qJvZZmANC Vij3DG9P7NZyAg5/1af48KCSQstmJpEO9verFCEcTX+PzMupnQY0cfZSjV59xa6lFqBL qIuWriXE1O93AhE57YXnAU1MHcIJYdekLFGkw/qdLyefEnNU6yGi2aRaQqgm+i5fGGAE RxKcRsoT/TGZIoQhO4XBEJUvzIOSFfB67pJbbqSm+3FE6hXZHXidHba2yPaeN+MWeyzT m5UVPp72EHKNIejjPiDZ/1KKi6f4TkGcSQh6N0Vl3bfo5saNG0KnaQ32lettyjYXs+hk UUzg== 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:in-reply-to :references; bh=KUMnWfyPXDU2HdC3qB5Gs6KsZayVM5HgW78NIo1PgXk=; b=WfsacCIq/KdgTMcf4ree1RhOMaKeUkqIbi/FliwqhHQyOEcOlBDWPAvfG3OUqhT1Oq +i58RJ8312SZQNwHnlJUASxBFH9A7XbkT2yNEUUqEpVDFPBnu0b5MSpKiEqaFqa+1L4Y c4KHqj6bZ+8e56Xr3Rx4QLu016EGfudAHz+np3oQhPrjy8hjaZwASFDYiksV789DDTjP Be9YX/1mojSiQUTgfvwDKDjYszQlo5AyNum2d/ToiSU+LqU1uMgLCShEN2R5zMSQ+Q9P j4gtUw1YtoNKeV9xL1pUFmGbqWcf1Oi4iRg26V72YNx0Ilxe3Xt2HPhT5YMtqSv9ByI+ +2DA== X-Gm-Message-State: AGi0PuaYTMQsnWACkVlcx2RAx4PZrvJVANR5DH17vwGHFbp8VKRZZzKm UoxlduRRp/me1fayCxj7wvaRVhnE X-Google-Smtp-Source: APiQypItXVTZwl3JrRP+t2pFN1AdPUg249odzqVca5R9qrHzokti+UbB0ZWfL0eQJEcRBct6qQlrLw== X-Received: by 2002:a17:90a:9295:: with SMTP id n21mr2543518pjo.195.1588045763850; Mon, 27 Apr 2020 20:49:23 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id p189sm14095506pfp.135.2020.04.27.20.49.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Apr 2020 20:49:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Apr 2020 11:49:17 +0800 Message-Id: <1588045757-25182-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588045757-25182-1-git-send-email-lance.lmwang@gmail.com> References: <1588045757-25182-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/wavenc: simplify, use av_rescale_q() instead 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/wavenc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index f6f5710802..1027f107ee 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -434,10 +434,9 @@ static int wav_write_trailer(AVFormatContext *s) "Filesize %"PRId64" invalid for wav, output file will be broken\n", file_size); } - - number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration, - s->streams[0]->codecpar->sample_rate * (int64_t)s->streams[0]->time_base.num, - s->streams[0]->time_base.den); + number_of_samples = av_rescale_q(wav->maxpts - wav->minpts + wav->last_duration, + s->streams[0]->time_base, + av_make_q(1, s->streams[0]->codecpar->sample_rate)); if(s->streams[0]->codecpar->codec_tag != 0x01) { /* Update num_samps in fact chunk */