From patchwork Wed Apr 7 18:25:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 26801 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 29FAA44AB1F for ; Wed, 7 Apr 2021 21:30:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0547E68A148; Wed, 7 Apr 2021 21:30:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 727CF680282 for ; Wed, 7 Apr 2021 21:30:40 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id a1so21903199ljp.2 for ; Wed, 07 Apr 2021 11:30:40 -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=CDGnxTXqneh3V4ICAmu5doVWS+ZRTKDg5mNBgXcT3sY=; b=qpoBU87mrWRV7v7wBQz5i+4gbK8uUEBZSyx0tDZYAe6snIs08ngIy1U2NxgQFM60tO 5pFXXcey7JMcM84IzBRm//Jrj/9Mdyc5XnMLcov9L7Ou45+W4FCTzfNqVkumdV+0kF0O D+b+JdRQkfRWt2KChcuU/4LYQGD5n0YOc8D6e+NtwKg1rFRdgEoV9zET80YkpkMPXUqi uOXQHQYoDKP4LfS8CLhoTvzeWlLW7gNiitIjGSl8C5Pjuvp5x435GAdIEgi2B3kjjzA0 B+mX9Xw1yTspsaNOTCqF5lqx+GQOE3OFyMNXXLCP9zDxNpTE3mCQ/gki7//12wZoD/lY g7oQ== 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=CDGnxTXqneh3V4ICAmu5doVWS+ZRTKDg5mNBgXcT3sY=; b=SqdBJMXJwHn1DKWFT5daQknwiFVUghvW/DCnGHSCrJ3Zz0e/Xs1bbE3G6tJhkPKSQs 4GyafdfEbLeUhsF6roUe0QrQa3hd/biI7DMhPwxM8paIRJn1kPyN3F+uVHMHhHFemB/C 213G218yujH6ujPyCFHICSbJWuraKMXMQwDg/xXNbOr69Wov7pIdZMSEu4ZanWEV0yZ8 wkUerEZ8skCnAm9ciRMCKCnz+xgzK5Kw5pX4ZjkHCEnnTboQi+t+g76o7VKz8cWFgaGa KWTeeL3lQT3gCzRdPeWXQpA62flEBJWHLjD7mWjsXrwJuVODWn7bNHWhQQrTSxMDhR3/ 3tSA== X-Gm-Message-State: AOAM533CrZKoFAqDF4mguRRAWo5nK/RomuVqdcB008bY1m1SyyH9A5YK vbspBowK7/5CoB0QQZykmfkMSvSXRR8= X-Google-Smtp-Source: ABdhPJzFqmidDVk5UbVshHiDOQnEhMpiIigUM8AaxaW+qmOW365PfOu81HPzCeAZWYBldOnN2MwD4A== X-Received: by 2002:a05:651c:39d:: with SMTP id e29mr3023686ljp.259.1617819906543; Wed, 07 Apr 2021 11:25:06 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id h9sm2557660lfj.163.2021.04.07.11.25.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 11:25:05 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Apr 2021 21:25:03 +0300 Message-Id: <20210407182503.34666-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/img2dec: set r_frame_rate in addition to avg_frame_rate 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" Apparently for various image sequences libavformat/utils.c can calculate rather fancy r_frame_rate values, such as `186/1921`, and since ffmpeg.c utilizes r_frame_rate for the filter chain time base, this can quite deteriorate the output frame timing - even though the user has requested the image sequence to be interpreted at a specific, constant frame rate. --- libavformat/img2dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index be7149bb2f..7b03cb2af1 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -222,7 +222,7 @@ int ff_img_read_header(AVFormatContext *s1) avpriv_set_pts_info(st, 64, 1, 1); else { avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num); - st->avg_frame_rate = s->framerate; + st->avg_frame_rate = st->r_frame_rate = s->framerate; } if (s->width && s->height) {