From patchwork Wed Jan 22 14:52:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17470 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 4F05744B987 for ; Wed, 22 Jan 2020 17:00:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3002368B31F; Wed, 22 Jan 2020 17:00:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40BDF68AF71 for ; Wed, 22 Jan 2020 17:00:03 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id q9so7128981wmj.5 for ; Wed, 22 Jan 2020 07:00:03 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Fi+hHALQb3RIWtPJVO0AK8IVjszvivhbVjMsn9jr0xI=; b=O1fPryH/7LK7xqcOEeaXE9HkgfEidnLY8rAVJLTEVaUyPtf6ZFgpqcenkKFcTJ0PUi bR9TbnjrUmze7/LBVmTylhlmrM7YAlf0cijAiJh9bk5aVqNuRTDUgl+aYbleQQevlJP0 wkCCDE+02M24SdIv72cdGIxwfkgdqlYG9pkD1CCQZsOAwSoPNZ+N6Lyb9tPvMpwQA6QJ VIGF3dvsw8dKFFsscEGhywNXug+KmmRZDFL/aKQsucQ+09vKYjqiVH7z+iywu+4b22zG Pru8CZD/6BhKj8Pr4+3tEjhaICF/h3Y5CGrqP5sJjN8VQoqTxWmUdydqHGDDtSObQcWq 5C2A== 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:mime-version:content-transfer-encoding; bh=Fi+hHALQb3RIWtPJVO0AK8IVjszvivhbVjMsn9jr0xI=; b=F8lU9+hYOWCRUybIJmBvx03RjVNr/kYS94iTgxJT76c+kv04jOfNou7RvcFHhLQ585 crNb3HKjdckv/a2Pxm2KBexSyNEAcbebGp+iHGLmQ58xceUpIa9QUDS6qoNRsjMKRGne qiSrtoXPx2AUaX6cZ2PADrSxTSV9p8dANen4e0+CVKXAGrC0M5SKOCnWdVlEsMk8tL8g gFoOXS+GXAKrYvSn6/llzON2l7i2tt1juxXpRmuToAz+5mzAAlTAbbAVJ3KhfnE9pnac kgc7ELe9rJGo/feRm3/vs2mezFWBxqmXZpyUqDtiyH5IDfSBe5QTTgS5DlKiel/pldMq IlIw== X-Gm-Message-State: APjAAAWIrUdgetWVs/CHZOmDb1uFB/GdPpAcSPmVUMmA6EoDFWbtc1Tr 6gcdmuJ+qg94758tNK87mqYpYol+ X-Google-Smtp-Source: APXvYqxLgO7RGipD9PbgGdZV8LYyOXTLVzsbptO1J6O6YTppEmezNoHqFH1l22XYoVNrZRQL+2eY6w== X-Received: by 2002:a1c:a584:: with SMTP id o126mr3280701wme.163.1579705202604; Wed, 22 Jan 2020 07:00:02 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id t81sm4452092wmg.6.2020.01.22.07.00.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 07:00:02 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Jan 2020 15:52:09 +0100 Message-Id: <20200122145210.6898-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200122145210.6898-1-andreas.rheinhardt@gmail.com> References: <20200122145210.6898-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/asrc_sine: Fix invalid left shift of negative number 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" by using a multiplication instead. The multiplication can never overflow an int because the sin-factor is only an int16_t. Affected the FATE-tests filter-concat and filter-concat-vfr. Signed-off-by: Andreas Rheinhardt --- libavfilter/asrc_sine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c index 3a87210b4b..61499ee2cd 100644 --- a/libavfilter/asrc_sine.c +++ b/libavfilter/asrc_sine.c @@ -247,7 +247,7 @@ static int request_frame(AVFilterLink *outlink) samples[i] = sine->sin[sine->phi >> (32 - LOG_PERIOD)]; sine->phi += sine->dphi; if (sine->beep_index < sine->beep_length) { - samples[i] += sine->sin[sine->phi_beep >> (32 - LOG_PERIOD)] << 1; + samples[i] += sine->sin[sine->phi_beep >> (32 - LOG_PERIOD)] * 2; sine->phi_beep += sine->dphi_beep; } if (++sine->beep_index == sine->beep_period)