From patchwork Wed Feb 3 00:40:27 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: 25360 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 4378A449090 for ; Wed, 3 Feb 2021 02:40:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12C2E6897BF; Wed, 3 Feb 2021 02:40:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2ECB1680812 for ; Wed, 3 Feb 2021 02:40:38 +0200 (EET) Received: by mail-ed1-f49.google.com with SMTP id y18so7675598edw.13 for ; Tue, 02 Feb 2021 16:40:38 -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=qtQjts4rdNv6sr0mA8D09KJXV0i36uIDOKaPGbJLbMna48190UHb2sD870myGkvYyH laviL7u4jLFrgVm6RO6oe8CczHM+MNBIEZrpMRIUpGJtb9U5+wGjFV8SexOMhjA4hVRx z3LtZsN3wUba1gFR/Ib7tRuCZBI4IPKL8QPVh/1ceGZreWUcCLrSA9AtqWbg0drwjcTE sbPihCOwUqEjrACGf3xqhIgtxeqRFsYG6bcjlP1GTohoRH/0Rw5WEAnqCE5Y5tqWB880 IG/Ub+ooq4MPqDybw4hm0bTUv1MpQ8jTqaVTeeg5KviBPJwOI8FD3DU7pQH2NMw6UpDO jE8g== 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=jmI1AkhY/8/TB5tv4y11MKiHnBtU0+bUS+B2d5QovTlzaPJ4GnTOq8TrF06UhsPgn/ W5R0zTpzUufr/ZDiHcav2cYfPiUbaSYxHGNFxiwuRyGpRor+UNVONr3mXEfFAzKh5nac dZSXSllMgZo8zheOIY5CB3ndaNfkWz6W0TLPHQE+NodZEnrLYc8Ea9cBbXiKcn+71+sV rw2OboVPy59Lmyuvmv66464Epx6bLKNWiTZsEhX45O7lzLutDcPTjvf3l5e2rDOBzhHF TCC+4KEkQtfIUz//QdO6djjo1Bi9IVWQEB6VKS8GPCb9KilxHyyRaGN5wyb9+sO4lUvX DkGg== X-Gm-Message-State: AOAM532pfR3D5t7PR7pcFNzl+l+E0JvfLaiyrQAhEefG/umnbiXn8XRm YD8SlSZvsNP4C95qKxeThe9wX3oQyOxDFA== X-Google-Smtp-Source: ABdhPJxeDmyTwLDgQtEuYJXR2Igq/7TXcAgdjzIKsVThzhRafNsZmSCDhQ+QeWfGjDZy/BwaYsimxQ== X-Received: by 2002:aa7:c504:: with SMTP id o4mr665287edq.86.1612312837778; Tue, 02 Feb 2021 16:40:37 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id b6sm61066ejb.8.2021.02.02.16.40.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 16:40:37 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 01:40:27 +0100 Message-Id: <20210203004027.10772-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210203004027.10772-1-onemda@gmail.com> References: <20210203004027.10772-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)