From patchwork Tue Aug 15 14:49:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 43227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp622418pzb; Tue, 15 Aug 2023 07:49:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/1H01IWmNoyu0wuxx4rxGq6UEaK/RKo95J/1peN4PCMt7/A9s12dty4HNLC8r4bE68SVo X-Received: by 2002:aa7:c557:0:b0:522:cef7:83c3 with SMTP id s23-20020aa7c557000000b00522cef783c3mr10687684edr.8.1692110974372; Tue, 15 Aug 2023 07:49:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692110974; cv=none; d=google.com; s=arc-20160816; b=vAyERTn4JqhhH2MNLfOHvADYd5OXhl8h7A+kYcunHrjYE3pTusLnZBAdEtO9WcXY3+ 3YmAi+jg9m/s6mKpg/dmmQCs1C43/linWWFw7LltoDb7wd+8R/E3mQSLkZsCxxAtFAY/ IOUcSmUAGDbv4FnWux94+gJgJPZkfK19XjS5NMCMWbYa6c8TNUarYQQUm0givcd4ATqk gV1LLVhgceTOmrs+uDlCwF3UQRrQSKIeYvFjoRajlvCwIxfJcBB016LF2tW6KQcngGPf lzR+dynlrJus6OjdLrDbXvBknLTpmuCT6dI+YnwMIAf+k1hcTBPM15ecqEfSSreuBaHL xnIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=EckYaT3rzgsDc4LbjRxb1D5Dqjx0jSnGvPpH4wUGb3Y=; fh=ghmNPjFTSM6oKC/7k5yo9hnu8V2TFPrY7GkS/gBuc+4=; b=WXtPgU5Jf+IXQBSp3OKHLJ5JkP8M4hALUdIpVK7L/jCLdp5bvedqsdGPCUyeja/z12 AJC1+2uixPMELW0jRv8icLXIWOPqp2c8BcdHfANq4+2w9mYoTZ2roZkmgzlRt+10P+P4 NioMeCZ+YjNKXv/kEj4jHDVFIXcsAHNuuT7kneIFlozuayBY0oJFIlXnPQWv6O6/3/4D 5ASDFeTBVFkri6i+w8gO4wNlifiLUHuMiFK3pedzCjXcTQqVWHwQAqopEgYsCfZ4RW2d PNKp5k+JjqZ16k9as4yD/vSKcYypuK/WUOKhpEzq3t6XMbHFb4RH1yTnh7zaWz7+nmgX NmNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=PCALlWQI; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j9-20020aa7c409000000b005256d6fb974si2075728edq.92.2023.08.15.07.49.33; Tue, 15 Aug 2023 07:49:34 -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 header.s=20221208 header.b=PCALlWQI; 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 sp=QUARANTINE 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 26F4768C2B9; Tue, 15 Aug 2023 17:49:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f52.google.com (mail-vs1-f52.google.com [209.85.217.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F289768C2B9 for ; Tue, 15 Aug 2023 17:49:21 +0300 (EEST) Received: by mail-vs1-f52.google.com with SMTP id ada2fe7eead31-4475fc33c8dso2201581137.0 for ; Tue, 15 Aug 2023 07:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692110960; x=1692715760; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=ZTjeesreLie9i/O1kZ1BGIcpOKl8NIsT7cMReHyzRcc=; b=PCALlWQImLFXtKdUCFI61tmzL6Qa0eqNrcd4AOWqvaHthAIAL7hrLMFZIshyJYjDMw 6q/ZzmGNX6uaYYDeJPYUEQcokhU+mDkm+nVgdgLrYqau/2NhdQpP8ad1VTloEvoK7z7s 752WMxjn0q9Wu8Nrj3Mrg0FMvqPLVyT36uqkg/dZbIUGAE1uZ1eHz/XoMtwJP0mmAX9C ccWVEuRZJKeErpFLRgSIS8ExPAFC/exhYD3nFwTIuae7dpLirzOdwiyCZ7Nl3RI6nTnU nu/PnydRx3+nR61CidyhTI3CW1IXCFrXK2bVYyp/GS1wS86P7jHwBxdH9SXDJgXbyBcF 24aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692110960; x=1692715760; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ZTjeesreLie9i/O1kZ1BGIcpOKl8NIsT7cMReHyzRcc=; b=UvBPUXaWYuIb1EdvLpogX9jbno2ktjnRtp8esJlYrPjpU+4xjOIWvNStyeBHFKdDRe u+zV1rOtHkjSs26bIccVvKOhCENc+KXzk+nG1xwJmJHTa+Kx0EOhPjWlxx6E2pWy+Q5l QDcPKY4uJQcFc1zEhSVM0TTIKmXvUBSeSmWYB6R7OPj005iiQHh6IjTlF9sv3CqnISac hdceEbujidCx8HxoewErrNvTwtzD2WEEoQMNtVN3pPl82kmfG+2KFGN2NOI/GshP1rnO JQjHTE1WgLw4mwYMXF0gTd9Pqd7dnbz1rKh7YvfV349hhHzU3emy2WgBc/s00VTwDnwP s8vw== X-Gm-Message-State: AOJu0Yzb1zZITv7/lyXiuZnCMFdmKKxTMtj74kFNzTt1+nS5cHa3L6Kf rxe0Ivxr/td/FPFCB1DeE199QrFDiT/K1AVZASUplBzg X-Received: by 2002:a67:e28d:0:b0:447:4665:b465 with SMTP id g13-20020a67e28d000000b004474665b465mr12736492vsf.19.1692110960203; Tue, 15 Aug 2023 07:49:20 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Tue, 15 Aug 2023 16:49:05 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] adpcm fixes and improvements X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 3jz+6eCQPZqZ Attached From ff913fa6f91dbe17972f39017cb766d517ecf044 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 15 Aug 2023 15:51:10 +0200 Subject: [PATCH 2/4] avcodec/utils: fix duration for ADPCM_MS Signed-off-by: Paul B Mahol --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bd4131db62..61e2946c16 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -740,7 +740,7 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, tmp = blocks * ((ba - 4LL * ch) * 2 / ch); break; case AV_CODEC_ID_ADPCM_MS: - tmp = blocks * (2 + (ba - 7LL * ch) * 2LL / ch); + tmp = blocks * ((ba - 6LL * ch) * 2LL / ch); break; case AV_CODEC_ID_ADPCM_MTAF: tmp = blocks * (ba - 16LL) * 2 / ch; -- 2.39.1