From patchwork Mon Apr 13 12:02:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 18908 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 DD45744AC8D for ; Mon, 13 Apr 2020 15:03:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF01468B694; Mon, 13 Apr 2020 15:03:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 689A568B42B for ; Mon, 13 Apr 2020 15:03:08 +0300 (EEST) Received: by mail-il1-f173.google.com with SMTP id t10so8251738iln.2 for ; Mon, 13 Apr 2020 05:03:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=1bz8eC3oFhj8s+6rvGFJAlWj8x4HReFe5eHsf6MYpq4=; b=OsrtmVHVTnjgx8ZOZPjkD0VHCRhUs6fJEdfMtGT3bK3hfdvYHTAcwj2y3+iiwWb3bq IRbhiWowyrEAH9EiWifPj7uwp90OEkpMiiU2cQ5F7BiwWhuYcnyw53KSw5c9GXZh2BHs 3nYV21DuQCVoCa0YNGBuYaw3QdKWhl8Ifz4z8DUjV6HhWcghV7YCg7Hg3KC3o4Vz1BKt 9JqfFk9C/frzffGc/K/mMVIi0c7n3kNcnfA9Ivoa+p5Tw/DOnHq1ob95Hjarl5lmPo6E uAIwrzRRhsuGbWJzA/GqUavs5wy8KOIRGh1uWPQwE6lOLVYj67Qb6w37etGe7m2FoT3a Nlrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=1bz8eC3oFhj8s+6rvGFJAlWj8x4HReFe5eHsf6MYpq4=; b=DDZ81DEXCA2IXQ2iZ5CqY3Yc8s7/N0L+2hmt0XQhhAMMrsfqe71sahbvYGHQgD4yFw npaTHQXqltzGWhH28UoBBg+qwzag0Xidk8pY8fFntcDwShldCXxa0wxHAjKL6x160/yX P68t3Q1OnR3OYlbCyWrRLwmx3Gr34CmSg80JWvRiX4nwhxfzydT7mPgBi+XONfJzOIKW Fd4VHse/F/LbwuSDk58xsVm0kZ8X9g6HU7ISdpNH02bOWL58vMCWB57wXairb9CayyF0 DbL6wYH134h7TRwikR9dtb2Ki68ka56RXZpoFcl0CF4EY+FvuR2A7g5XxbnMdckys2vm TJxQ== X-Gm-Message-State: AGi0PuY7KNA2sKcwWMSyW7QxbfBdxvV65h8D33wxbEqMd4Lbh9Iu20UR meGRXKUr79g5FqqTOep0oHaJJTBXdlITn7bxtynsNA== X-Google-Smtp-Source: APiQypIJmoACvO4bEk65ulV/NjrtDbIK/PF692mUDdm3azp5ugq3ZnAos+Ji9vf062qBZIwjMpfL5su4GxOcCVtG1NE= X-Received: by 2002:a92:8fc4:: with SMTP id r65mr3823911ilk.179.1586779386755; Mon, 13 Apr 2020 05:03:06 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Mon, 13 Apr 2020 14:02:55 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]ffmpeg: Do not clip timestamps at LONG_MAX 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" Hi! Attached patch fixes ticket #8612 here. Please comment, Carl Eugen From d36feae5e072d0efc4b2b85bcf042eb102e331b4 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 13 Apr 2020 14:01:14 +0200 Subject: [PATCH] ffmpeg: Do not clip timestamps at LONG_MAX. Fixes ticket #8612. --- fftools/ffmpeg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 3322723748..3588c4e2d6 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1147,7 +1147,7 @@ static void do_video_out(OutputFile *of, av_log(NULL, AV_LOG_DEBUG, "Not duplicating %d initial frames\n", (int)lrintf(delta0)); delta = duration; delta0 = 0; - ost->sync_opts = lrint(sync_ipts); + ost->sync_opts = llrint(sync_ipts); } case VSYNC_CFR: // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c @@ -1158,18 +1158,18 @@ static void do_video_out(OutputFile *of, else if (delta > 1.1) { nb_frames = lrintf(delta); if (delta0 > 1.1) - nb0_frames = lrintf(delta0 - 0.6); + nb0_frames = llrintf(delta0 - 0.6); } break; case VSYNC_VFR: if (delta <= -0.6) nb_frames = 0; else if (delta > 0.6) - ost->sync_opts = lrint(sync_ipts); + ost->sync_opts = llrint(sync_ipts); break; case VSYNC_DROP: case VSYNC_PASSTHROUGH: - ost->sync_opts = lrint(sync_ipts); + ost->sync_opts = llrint(sync_ipts); break; default: av_assert0(0); -- 2.24.1