From patchwork Mon Dec 12 23:48:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1767 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1928371vsa; Mon, 12 Dec 2016 15:48:54 -0800 (PST) X-Received: by 10.194.246.170 with SMTP id xx10mr62576095wjc.174.1481586534674; Mon, 12 Dec 2016 15:48:54 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 187si30824809wmx.141.2016.12.12.15.48.54; Mon, 12 Dec 2016 15:48:54 -0800 (PST) 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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06D5D689F2B; Tue, 13 Dec 2016 01:48:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41C6E689E77 for ; Tue, 13 Dec 2016 01:48:41 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id u144so14619115wmu.0 for ; Mon, 12 Dec 2016 15:48:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=3cnPYFa2bcTKVP/S6zRopu8jR7KOvK5nONWy2LE6CrY=; b=Qw+mLsz44W6F3Bj/Yz/S0AoZAQ9/Lc4GJF32TqiHiDor3l+Fp/cpCxr7lp5UzM2CFq kZrBTbRXm3yHSG7+pdPvK/vYb1Tzgfhj4VPWjsEYItUhFCvNA76TvyQSWBmn90OuGUqJ ykKRFRLbknnI2ZSCQ6qqVW1dVGAYntryBg6IAkPk8tp+GoN+8+IhhlNAzK698pEPyiGR wRrz2leTTfUv4V+ea0QcsjacMTuq/mK/LRCntiS1lz33HOzucy8g8tLTuTHU+9mIce24 njm00tt++8tjU86yMPKLIaZxBur7u7M7A7iAbct4a+N+CMhhgAbtajjrHILzmSYYhoRz GY7g== 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:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=3cnPYFa2bcTKVP/S6zRopu8jR7KOvK5nONWy2LE6CrY=; b=GGLDGWd0+FNXwcf3A2sn9n+/rNv3BCkICIuk8MDI421XxccGapUSsQLbuVsAqoHqXq /7g9RL0qpUmHYTOkAcAItnP90PFILzO4TWhHSiqpSnmTsWeny6HtJ9HocedKh+YcH+iF uv/IjVdt7sBLm45jQEP9IJ4NtbwIolRa1dZ3gffI5lBySEeGphlvUcXeycISEqPlYlEz az6jvCgVIeT5TmU7Vl+xwyJoTkc9KHUlJnWsFHvR/54uEfxTvMpjRSi6vu3X18arztol Vk5i/+30whWHxzJ3BZxa4YDsERoOkk/j69HKm1J/K3YsLsxgWptkLOw2r35XTd1zNYBj X2lQ== X-Gm-Message-State: AKaTC00zv0bHGUwACG2nlG0w1A7rIXkxEnoTcwT+EBDhj/lal+OPU49rLhy5wEYxzdHD/w== X-Received: by 10.28.227.215 with SMTP id a206mr16927wmh.84.1481586525628; Mon, 12 Dec 2016 15:48:45 -0800 (PST) Received: from [192.168.2.21] (p5B095619.dip0.t-ipconnect.de. [91.9.86.25]) by smtp.googlemail.com with ESMTPSA id gj6sm14204937wjb.29.2016.12.12.15.48.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2016 15:48:45 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <18a6d792-ed50-8963-ccfd-8c585824682f@googlemail.com> Date: Tue, 13 Dec 2016 00:48:44 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] omadec: fix overflows during bit rate calculation 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" Signed-off-by: Andreas Cadhalpun --- libavformat/omadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 6e476db..e7751d0 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -365,7 +365,7 @@ static int oma_read_header(AVFormatContext *s) st->codecpar->channels = 2; st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; st->codecpar->sample_rate = samplerate; - st->codecpar->bit_rate = st->codecpar->sample_rate * framesize * 8 / 1024; + st->codecpar->bit_rate = st->codecpar->sample_rate * framesize / 128; /* fake the ATRAC3 extradata * (wav format, makes stream copy to wav work) */ @@ -398,7 +398,7 @@ static int oma_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } st->codecpar->sample_rate = samplerate; - st->codecpar->bit_rate = samplerate * framesize * 8 / 2048; + st->codecpar->bit_rate = samplerate * framesize / 256; avpriv_set_pts_info(st, 64, 1, samplerate); break; case OMA_CODECID_MP3: