From patchwork Wed Feb 3 09:57:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 25364 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 0A52444B486 for ; Wed, 3 Feb 2021 11:57:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E717768A6F0; Wed, 3 Feb 2021 11:57:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 969F368A477 for ; Wed, 3 Feb 2021 11:57:45 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id jj19so6960511ejc.4 for ; Wed, 03 Feb 2021 01:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=K5O5bttOKXTchxFtyR00hbJ2qsAP+IQ5+jgLXbAwxEw=; b=XD37KZvQ0QhF1/iYqhJaWsSb2om6I9sr5m9O9/XErtFwuC0g35MSqDT7u+gmIPs9mf 0ughmp5uwmp9Er9G/Ro03BLg3wbVp8RiOCQbj9vNy8o967PUshioxi9m37VO9iSMXz41 RpraOCWcy8mRRpJ4pi4SLVKwOrFM6Vy92uI0X8UFU3fQOVtrcDdExGzah+FcrAtr/vpQ tKLto6odJ+MwrwOdckI2ZaMnzI4JWZRN3tYNUntxhC8EY/pnGCvOMmfavPtOPh3DaSh9 8Fgi79Tyj0h7EXGO7OeTAoBgbb7jhSMJbxNyX2ftqyjWgj2xxFhcXWhohlY73HiA24kA W0Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=K5O5bttOKXTchxFtyR00hbJ2qsAP+IQ5+jgLXbAwxEw=; b=klFp3qI/5DWnDd3xk54QZvDMSgZWkFBE3WQMywR1ylfw2w27SQd/refBiDqvV//x3k UJswjRkTrCnn564cetbjJqrIlCLYM8xGyyPc/h1zJhrdzB4lh1KrXBlU8RstEYn0sgWH Qceeyw7X1ZbuK6ABfkOR50OyoiLYYW08c+H15BXXmAk7Si15ivoNvu7q0XXe2KKIcFK1 3e08KDRw+qHGlfSBl48Z122Z5rfMBrJTRohZQydGDixvkgIiNNAag43YwLl7STEKGxFE bEBvznStZZhCCUNI2pzIYEaoXre8i3wCYE24aNTLQlzgGOkHlD7K+InicvR6UY35/doV yTTA== X-Gm-Message-State: AOAM532moACz/DLx258Q2qasnMhD0A4iHkQCgO+QOKH7u0ov6P8Of9tp p4f4FJdikw0IHng6QsivSBEnRckaFjfTTA== X-Google-Smtp-Source: ABdhPJzq+qBMaMk32Smtr54zvTm7JKPTLN9Ee+/Q09RNesIacuovR2K40f0gI5mVh35005QfnekS9A== X-Received: by 2002:a17:906:e104:: with SMTP id gj4mr2364976ejb.349.1612346264961; Wed, 03 Feb 2021 01:57:44 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id u5sm638836edc.29.2021.02.03.01.57.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 01:57:44 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 10:57:35 +0100 Message-Id: <20210203095735.23205-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210203095735.23205-1-onemda@gmail.com> References: <20210203095735.23205-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/utils: unbreak BINKAUDIO_DCT duration 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/utils.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a1ae9cab18..4d1909b581 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1668,14 +1668,10 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, return 256 * sr / 245; else if (id == AV_CODEC_ID_DST) return 588 * sr / 44100; - - if (ch > 0) { - /* calc from sample rate and channels */ - if (id == AV_CODEC_ID_BINKAUDIO_DCT) { - if (sr / 22050 > 22) - return 0; - return (480 << (sr / 22050)) / ch; - } + else if (id == AV_CODEC_ID_BINKAUDIO_DCT) { + if (sr / 22050 > 22) + return 0; + return (480 << (sr / 22050)); } if (id == AV_CODEC_ID_MP3)