From patchwork Sat Sep 17 04:30:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 37974 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp22186pzh; Fri, 16 Sep 2022 21:30:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7T1pv8gsGO1nYpszsj9VBJjZ8vqYCG2VbGrvyOyMD4b8qM2L+xDOHSgJkwCnfsIOkAZF7y X-Received: by 2002:a05:6402:10cc:b0:446:491f:d6dd with SMTP id p12-20020a05640210cc00b00446491fd6ddmr6458372edu.360.1663389020197; Fri, 16 Sep 2022 21:30:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663389020; cv=none; d=google.com; s=arc-20160816; b=s2SgtZBVVtSZLN7v0gpaQ9cAKb6jFTKwff6djTQ6FSm0uLdPSW9fskcqfg9xUbxcl7 72mWSLBlkAgbMhzT1gnXHlUCkrwvFUVmBgr7egJAoaOoMzb3e7FnKjG9sSDpRQw4Z3b2 TM6yPtIepjcG7si2mNFpJ8mrc0PCe7RGlJtldZRd1BMZkH156OevikdG/MgbC/OA+8t3 Po50besIVklinYUbuVGlH6RXLGcJfhriZja0Jn3yrMf8SitdovG48/YCTG4H7G+1atrF 28ib+yjh4uTEa1n9761V3EWDs0HKtaSwm+UIVP4nEpYVRUm9zLRtSfaeSr7v66xeH2N+ DYwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=8bjx237TTbJeNVxsSO9a2h0mDY3WmKNLBJNDrK84Uyo=; b=rwhL+QRmoT9AgM3c1aNVIqPe0ZvOXstB1QbKzFK6F0nZt3GkoIsFR4JHZ6f6hgvuea O0jvwrOw1vJPqqlMtNTbD8jT9JLwkI2oRkYQOb2zsbvNyEiiFkyyQZuco/kADNmBCuuV eMQMXX5tlTvGYyKp+TJ48eG+eYW43Mq86FHET6+o0QtJRS7Sfb8Fua5Ve9QW+qr0n5CD 51aB/X3VhO+WFd/kBTB7xVua+4BT+HckH2eBv0UQg5t/iSVlvZHALlZbgVWCj+PD9XK9 3w7q7fRIMTTxESddDf32v0ccyhHh4fHXkVhTasXvfBU0SZjd/B5I1hgrFqD0+w5lIDXQ 7RQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=BKjOg3T9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ly10-20020a170906af4a00b0073305fd2278si14322182ejb.864.2022.09.16.21.30.19; Fri, 16 Sep 2022 21:30:20 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=BKjOg3T9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52F2068BB72; Sat, 17 Sep 2022 07:30:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8BE768BB1C for ; Sat, 17 Sep 2022 07:30:08 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1663389004; bh=Iri9bEzeHHjbvR6uAEU2ONhRG/YlMG72r3s2H/SzKW0=; h=From:To:Cc:Subject:Date; b=BKjOg3T9XhnY3PjNMJmphSr9GCTK0o4Qi5FJfgEYIdqGRaNBk1tr0BQe4Br1bXjAu ROg00Wa6NHSJieK+lgyPImE6pn5yaWwMPE3O3V9W6jOGpPcNM3zYze3VJYusOBk6vt W9xc1oqXc76Yn4WLC8PgfcJlwNO2VXLjAYkJIpDo= Received: from ZHILIZHAO-MB2.tencent.com ([113.118.100.98]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 78321451; Sat, 17 Sep 2022 12:30:03 +0800 X-QQ-mid: xmsmtpt1663389003tb0jmu1sb Message-ID: X-QQ-XMAILINFO: MBjwNRQMz5zUdwnHAQvGiqyK/AKLLyzCowI2KNPi1aC5XSKDYFJimCvyguQ/aT pGi1NIJAd60lUcFwWYH+pFvdXNquJXX1JIxvVPIZ/oR93i5npjCW9bRzqX/YruXNF+K45qlX2pI4 UCpLDBHgLOFR9ELtB0wJquaL9aOwc4CApIwXMuWkwqIsRC4xEk6poY6SOzqIz1m7ag3WDS0xAjDL BwDWWcXo2diSpX/4E7PL1RzheG5NVyOfs3v7QVuyq6eyDi+QSnY2RPVLbsKCptD9P9rFGEWqAKCZ +cVoiflCX3v3Y8vvjLtWtwzW6UW96cHs8MOW0VOJoxl8TQcA5IiQs4XhpyhDFTrW/tyz7hc0v/LJ yyduCgK2K18e6piMrFME/NGv7BOkFJmaHwYbRYZhprmS/ua+k39/07xVlG4IjqT/9qcqmKTFoeCV touu+YkM0ywdbLY7mvuH6jAMrY6ExfULpWlVETHZhLSklFqFpSX0Q9LzXE7klUIzoOIkHTIBea7G of7aqzSgCTPRtgtBxlGfJ1NpuhYVxhE/E9XeSab0tZ6piUi9TmRD5t+8Sg5uPQT9BIAx6aKxKrYx ZjhbQ+T+kv6XhffrMUj/HTWn3fcj2JCRdTvLTNPRNFFoOeh6qvCfOAm08llzFUps9eh2o0heiVfR JhcAV5bPdfeBc6NHGktZ+RKtBfvbOHq2eZzvXTJIPhCtid7Q3VCKsmJDI/03SkMnC4bSasYgoGWO giMWhlWt8fOVY8CDjGmcy7OfyWesKeu4ObwJLm4YA56wrZh4FmTa9Km8Wm04hUP7fskO1amzpqyl DWA7jcHvC6vM8tvnDYX9XMCvTkT6XAR7AQnV2eUfJ4R+ki+i2BMUaKD9P5h9x57zG0Yx3oVzzei9 rXyFUwaNWu4HVmZyNIQuv2CXm393eoFcMBfZI0/MvX4Dan9VbeZqQSGGFLiINUoU2rRsSjZCXQbv Vmf7OT1yg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Sep 2022 12:30:01 +0800 X-OQ-MSGID: <20220917043001.27933-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_filter: configure min_hard_comp unconditionally X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 47yrUGBVzPZC From: Zhao Zhili There are two issues here. Firstly, the floating-point comparison is always true. Seconly, the code depends on the default value of min_hard_comp implicitly, which can be dangerous. Partially fixes ticket 9859. --- fftools/ffmpeg_filter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 7a5308425d..17928cea2c 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -896,8 +896,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, char args[256] = {0}; av_strlcatf(args, sizeof(args), "async=%d", audio_sync_method); - if (audio_drift_threshold != 0.1) - av_strlcatf(args, sizeof(args), ":min_hard_comp=%f", audio_drift_threshold); + av_strlcatf(args, sizeof(args), ":min_hard_comp=%f", audio_drift_threshold); if (!fg->reconfiguration) av_strlcatf(args, sizeof(args), ":first_pts=0"); AUTO_INSERT_FILTER_INPUT("-async", "aresample", args);