From patchwork Mon Aug 12 16:51:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50992 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:1ff2:b0:489:2eb3:e4c4 with SMTP id ks18csp1489631vqb; Mon, 12 Aug 2024 10:01:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCURa9xcZ+3vU8IsqtSXasVqjZscWtDSO0wxpb4hQFEyEn04KmnYsal3HRCjht6QDulClFbKy2tmwrPi/aq9XV1V0fSf7zQKYjE9GQ== X-Google-Smtp-Source: AGHT+IEBdDBc4MklIWDSy/yhx2rmMjRy6n0512WnWUuanOwRp+7PBk5/qQ1DlCX35YyFm9wKG0sg X-Received: by 2002:a2e:b8d6:0:b0:2ef:26dc:efb3 with SMTP id 38308e7fff4ca-2f2b7132eacmr8804181fa.2.1723482073433; Mon, 12 Aug 2024 10:01:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723482073; cv=none; d=google.com; s=arc-20160816; b=j+echq7qFCNbyFQN5f7R9Kw1rAfzNqZ3tR1Un9lpZ+DHmzKWf6nh2y3J8i5H8gXtVU 0lQ06IcKKqVu9Lbrz7NVGMxezZJbF8b46b0NHP5UnZ6u7hDnUko8ROs9JUeoAnmZx9Xx pmIuaaUlfmZfZPM0C9KC23u2NIf6Bdp7ZGDhAp0L3AWoeFa84yb267YMd5WK4jUQelOU swrHa6sURltdPtJ2izwjfz5rNLkStTPJ29pHBVn2jQtqBfN5UgWWEIwqU5QEX4nmC8Bb PgbY3FA9l8GeTNpzBUQYsfmdsJECUQ7SeacZHufs/ycElNCBdIO9RIfzggqs5LHx088m A31g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=3D0ivHOtYqBParEN3XraxbaKKx3JwLW8F/4hc+7iE4c=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=j8PmTQErfLgCdpk5ZSqRbmm3P2Hp0Ls3t4JlowFNqhQIIvlZgOAIrlV6R/rXpcOb9U t+hjKkIEfaRMPATvW1he48+n7m2h5aQMfYYiip8Jl09sLr3DLKn6Soh0k2Y8GpStjjDw IrcTDlkEirfFHjQJ+uL5soRMXe929clN2a3h+S9OoULScMv3ydk39W2S+iRT7lweJNHk 5FCI0/4azcxQNvjYbSWTiPyvveHwJ2dRIyUygT3193nVN6zeUcvn42Is2ne89jVNSYER YJYOuwjStNC39dfO/Oh0hnpd5y89FzU7aoP+43OasJhLwfZAUeZm5Xr6g6+wrtRP5tgj KAjA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=fgCSOrH+; 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; dara=fail header.i=@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 38308e7fff4ca-2f2b8f11b4bsi397301fa.319.2024.08.12.10.01.12; Mon, 12 Aug 2024 10:01:13 -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=20230601 header.b=fgCSOrH+; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A71168D786; Mon, 12 Aug 2024 19:52:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5B5F68D786 for ; Mon, 12 Aug 2024 19:52:04 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1fc611a0f8cso32319475ad.2 for ; Mon, 12 Aug 2024 09:52:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723481522; x=1724086322; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Nglu7UWZ6eIrErXLk9K/1V3nCNOdTtDi2VBOV55a37c=; b=fgCSOrH+u1eCNKAHF3YXnQPMouQyvnGBe6qCkUsbQ+XPyYBuR3TA+7r62x0WjW8agh /w8fB6sXKDLAok7BuiVQuMQE+SV6xs5Xe9C34iL/f5qR/d5pwTSw+B+nNGOlrhOtmyUJ dK6S1vj/+kwNLXs8fpN3IjjP94821r6jZdeQ5UHHFmW5iRGFVI3HUlTvKYGZNRK9eaH+ Cc3jinwhvWqzYljBGFj7eBUZo5KKrtzc8CnEwuOHVKiyd4XD67+bl6eqRoESHIi8/Eir ItSdU+gj7crtrfBnUljOZZ13G4rrrJ0VGzeMMirbUpclwMosMgJOqzpqPQhQLZyhmfZu QIwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723481522; x=1724086322; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Nglu7UWZ6eIrErXLk9K/1V3nCNOdTtDi2VBOV55a37c=; b=XCmoK2Iw55EsYHbdzRhD3vdwLmSBh0Z/636IRo2IZRTFKOBeNUymqWKLWECYPNcg2f 6hSlSUJniNMNUwNmnRt6AiHDzU0i+C1tTf8BZedCX5dfEsTbdey9zNFYMctHO8HBGepr waYA8TcVG4PFUFweGP88rTGIwTFe4OEZxpYhqUONc1GXo7F7Q9Nd/5jwTaz5rPDaV/D9 z24PXSnp6bVD98IjHV/Dre01/TzkBOaZnCEptCLJcJT8W5oe9U8Aqj571BHnBWOCD+m5 M0jh8zkd4dt+9nhpk9hkmvgQ4EHQBwUboTqQfIb9RYS1p7afR2UnqDdFGVBdvi6urr3L Tz7g== X-Gm-Message-State: AOJu0YwFSHYW00E/I54JdRnTID3bbE98rqqTzRsj1YvBAGdZV+CptuQ8 DXspu4n5tewe2LPf18xaQZ+xDj4+NIOntt82Y5fbrNDb9GbDQ6QBY6ee/w== X-Received: by 2002:a17:903:32c6:b0:1fd:7fe2:1f26 with SMTP id d9443c01a7336-201ca1c78a9mr8583355ad.52.1723481521786; Mon, 12 Aug 2024 09:52:01 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-200bb7e8652sm40102755ad.59.2024.08.12.09.52.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 09:52:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Aug 2024 13:51:56 -0300 Message-ID: <20240812165156.2433-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/adpcm: adpcm_dtk is stereo only 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: b6zKaWezFikL Fixes ticket #11133 Signed-off-by: James Almer --- libavcodec/adpcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 8d358bc414..623d33fd02 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -276,6 +276,9 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) return AVERROR_PATCHWELCOME; } break; + case AV_CODEC_ID_ADPCM_DTK: + min_channels = 2; + break; case AV_CODEC_ID_ADPCM_PSX: max_channels = 8; if (avctx->ch_layout.nb_channels <= 0 || @@ -1047,7 +1050,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, break; case AV_CODEC_ID_ADPCM_DTK: case AV_CODEC_ID_ADPCM_PSX: - nb_samples = buf_size / (16 * ch) * 28; + nb_samples = buf_size / 32 * 28; break; case AV_CODEC_ID_ADPCM_ARGO: nb_samples = buf_size / avctx->block_align * 32;