From patchwork Thu Mar 18 03:02:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Berclaz X-Patchwork-Id: 26444 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 2F67B44A79E for ; Thu, 18 Mar 2021 06:12:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A7BF688152; Thu, 18 Mar 2021 06:12:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 523F6680B1B for ; Thu, 18 Mar 2021 06:12:03 +0200 (EET) Received: by mail-qk1-f170.google.com with SMTP id l132so783299qke.7 for ; Wed, 17 Mar 2021 21:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=percipient-ai.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H/d2Zl1ArMaE7wsxok/CE16jFMBF9se7BVeff2teb9Q=; b=1wWqXRhOp2ug+haozUDn6UFmZiK0bJkXE3gz7/bbMpug8yOtMNIldR+6am03pguZID x472YqxndF99cC4P+nv1+Jo+6Ql8HvW527bPBf6db7SHrFBqRWxGIu/Zelc4Hszd9+MI V8SkmrTAGzrTx0U6k2FsOUYXMn8hAxLsQMRi/ePS1YRUu8bAw+lD544e9lLDE3pPUbof SGFXDnSCJ6N/q+Tj2M12MjtoyajBy+lv+/KHsNtbO4wIaZUgcV+FpooYLdx4lmsv9oRU 5efIsMRLT61qB19BZux5QwjGm4TEde866VGSuEDM7r9q+g2d3m1YHryYo8SC6tk7VQbt Okxw== 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=H/d2Zl1ArMaE7wsxok/CE16jFMBF9se7BVeff2teb9Q=; b=ebzC3J2YFL7Zelnq4SEG6cgYswb8OVLsjN/K9ZZeeaybPRCoQE7GndIHXtlPU+gxGe ktkPCWuBTFAx2xUgntWQLs5zNu8etTHnAsFqjG738AxP2zWuLRudkpuKvs1975tLzVTF JiftjdfhaJ/tiFfrgYU2MLBpGQMtabweBTnw+hl4IxnlsixUBOwIhFRtyAXRqReMGWwg o6kHhSKB1onNXZvuztgM9iMxfpXkpdmGmMnnEK0Yn+EHDS8CyFYGDjQCCh+LfitIZfjb KPh7THhWY1p4XmH5CN861Mbhv21jMONNeUd5VflmHJZ2hhWM8m3o70hFMjKP1G5wQyRy cPAA== X-Gm-Message-State: AOAM531C0T7JEJVrx0bwo4GAggRMtS3UkMvtI0fBQFZhRy4BchsxtsQ8 CeOUJ1aAVdeDXQpJlXdWunyfs8Bo2A6pLtpC X-Google-Smtp-Source: ABdhPJxJSw5gFijySE6m5G/yI1yREU9dtLOhTqPXOja2TGr9w4s4Lg1SuG1ssPOfyyawn0gmHywBfA== X-Received: by 2002:aa7:952c:0:b029:1f1:533c:40d7 with SMTP id c12-20020aa7952c0000b02901f1533c40d7mr1933977pfp.81.1616036585226; Wed, 17 Mar 2021 20:03:05 -0700 (PDT) Received: from vrm-blade2.mirage.percipient.ai (c-73-93-170-180.hsd1.ca.comcast.net. [73.93.170.180]) by smtp.gmail.com with ESMTPSA id q15sm433272pje.28.2021.03.17.20.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 20:03:04 -0700 (PDT) From: Jerome Berclaz To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Mar 2021 20:02:38 -0700 Message-Id: <20210318030238.561057-1-jerome@percipient.ai> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] modified frame timing, so that we can make sure that a frame is never forward in time with respect to the original one, when converting from VFR to CFR 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: Jerome Berclaz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- fftools/ffmpeg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 46bb014de8..8085442156 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1238,8 +1238,9 @@ static void do_video_out(OutputFile *of, nb_frames = 0; } else if (delta < -1.1) nb_frames = 0; - else if (delta > 1.1) { - nb_frames = lrintf(delta); + // let the CFR frame go backward by at most one frame duration with respect to the original VFR + else if (delta >= 2) { + nb_frames = floor(delta); if (delta0 > 1.1) nb0_frames = llrintf(delta0 - 0.6); }