From patchwork Mon Sep 5 11:18:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Burt P X-Patchwork-Id: 427 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp53296vsd; Mon, 5 Sep 2016 04:32:28 -0700 (PDT) X-Received: by 10.194.157.226 with SMTP id wp2mr2193685wjb.48.1473075148589; Mon, 05 Sep 2016 04:32:28 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w192si16936242wmd.82.2016.09.05.04.32.28; Mon, 05 Sep 2016 04:32:28 -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=@gmail.com; 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 dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75AA4689F81; Mon, 5 Sep 2016 14:32:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12F8E689D83 for ; Mon, 5 Sep 2016 14:32:11 +0300 (EEST) Received: by mail-it0-f67.google.com with SMTP id i184so8594024itf.3 for ; Mon, 05 Sep 2016 04:32:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=2yzKJQVverE10g0wayvtxrVI+PqnRmgU2MlGDoSaBAE=; b=h9CYI5vEKzH48zL7C4IPyOVQnTTpjDj+r36SvW33LAZngAaa+x1AApyR+xsA6wDAHM DYYud6U76pAV7WllP6QWd4/tZe1exS20EZq0VR/fob2UOPffzonV5YTZv11ZHsd8OoO/ 6QQqVIXWnNO6S+2PbSxDwgZEJSS/FDoGEm4+/XV99X6I0YUORY5pBOLOvDrdLeGvEk77 5wen3mCnCdjcxxVVMciTe/SO3QIHJQF77KgAy1mFZkddK6lbI1F5xONFx4SaS/sBm7G1 Vu+Yqz+oCJqmAjaR3+LXBgU0bQRKo17/lsaz15uFAcnm4dWjl4jEwra/r52DGrLyJ1rX RENw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=2yzKJQVverE10g0wayvtxrVI+PqnRmgU2MlGDoSaBAE=; b=UOFzd+80TyFfyNIJ3xogytuQjyCHiDm9dYstJHNjn58M0JAiTr0Ah68sbru8b6wa5P JkQ2xb0q7uymUnxMHrBIDhuX5MeTqdKCNjei7gf5cng7JCuTQl69HCJc+yS96mhjMfHG 9i6EBYnZi00arQg1RC0tdqfm/i/n9t279rbrvhdwDi6utwK6BLCZikWaJA+QV1wuAoW5 GjPfTuIUKodOg9pOnAMAItuvItLgkf64n2Bry8nAmP0Ij6sTIuwzfSN6aMhd6vQh9vsV PW+YQYahF00QqOYFY/zL6uZy+UgMy0BxXcbQGMcT0DA62y3C3AJVgQxBvYsNjWD/h4y0 GJYA== X-Gm-Message-State: AE9vXwO/chNBWe6OnvuXCD2iHP+yT25+5x3dXBcJG+ZMRGx5PbHRCRNecmka0Q/d2GfnDw== X-Received: by 10.36.95.1 with SMTP id r1mr23049789itb.6.1473074335288; Mon, 05 Sep 2016 04:18:55 -0700 (PDT) Received: from localhost.localdomain ([216.16.66.181]) by smtp.gmail.com with ESMTPSA id e8sm10024609itc.15.2016.09.05.04.18.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 04:18:54 -0700 (PDT) From: Burt P To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Sep 2016 06:18:43 -0500 Message-Id: <1473074325-20959-4-git-send-email-pburt0@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473074325-20959-1-git-send-email-pburt0@gmail.com> References: <1473074325-20959-1-git-send-email-pburt0@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] af_hdcd: fix possible integer overflow 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Burt P --- libavfilter/af_hdcd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c index c8bda82..c249589 100644 --- a/libavfilter/af_hdcd.c +++ b/libavfilter/af_hdcd.c @@ -1004,16 +1004,15 @@ AVFILTER_DEFINE_CLASS(hdcd); static void hdcd_reset(hdcd_state *state, unsigned rate, unsigned cdt_ms) { int i; + uint64_t sustain_reset = cdt_ms * rate / 1000; state->window = 0; state->readahead = 32; state->arg = 0; state->control = 0; - state->running_gain = 0; - + state->sustain_reset = sustain_reset; state->sustain = 0; - state->sustain_reset = cdt_ms*rate/1000; state->code_counterA = 0; state->code_counterA_almost = 0; @@ -1788,8 +1787,8 @@ static av_cold int init(AVFilterContext *ctx) hdcd_reset(&s->state[c], 44100, s->cdt_ms); } - av_log(ctx, AV_LOG_VERBOSE, "CDT period: %dms (%d samples @44100Hz)\n", - s->cdt_ms, s->cdt_ms*44100/1000 ); + av_log(ctx, AV_LOG_VERBOSE, "CDT period: %dms (%u samples @44100Hz)\n", + s->cdt_ms, s->state[0].sustain_reset ); av_log(ctx, AV_LOG_VERBOSE, "Process mode: %s\n", (s->process_stereo) ? "process stereo channels together" : "process each channel separately"); av_log(ctx, AV_LOG_VERBOSE, "Force PE: %s\n",