From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 82FD24ABB0 for ; Mon, 12 Aug 2024 17:58:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DDAC368D59F; Mon, 12 Aug 2024 20:57:56 +0300 (EEST) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF14C68D8A2 for ; Mon, 12 Aug 2024 20:57:50 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-710ece280b6so1336491b3a.2 for ; Mon, 12 Aug 2024 10:57:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723485468; x=1724090268; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=zHKNguAgVT6aoS96+5AJ8XFR0Z8avUEnfSuArwwBjG8=; b=as/pw3Ynw8J358UNxncqyQJuUAXfuVS/yoQT/l6mBZJcgP85oCeszN2CjpGgKwAzTL ryn4J8g6B6MWez2Q5BEwP9bfi2+Oo02jofN1sxR+oBZ0I1fRU/TpUf/0FiXA9i140sNr 2Ezej2EXbgrf2FTz2W0koDUm6N/f31fCEfZfjUCOO9+yphn/2i8ZNzwVtObBroJGX5VT slPUPqE7PjtPPYGzdGlS8qp4QGZOAjITBGoJhbxlCQYpOWhISRu7euNAfoOmDG36HJhc wTdNsTEk6QOpS+0CF3+/q/mGGMnf+JKEgcE+a3KhbLMBhjiFz09o7YleIdx7Z8lalXL5 QXMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723485468; x=1724090268; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zHKNguAgVT6aoS96+5AJ8XFR0Z8avUEnfSuArwwBjG8=; b=VjzQgmDrOvBnG5xmFegM26bhhXPA6bAJ2HyCarS5sQmJWXEwAF2gj4D1vFghkROlrW tZSq4p+Stn2ZAKFthYZGSA9W1jNK7yPqvWL+nMWHfp/RhIZfH+lxoX9BVulH7KoBLZYv kq6xjDT1tZtSklCEzlclw8dfqZCeaqrVcIRAYfmdV0CGMN0gYYSh7qbtZk7lcbdnQjw9 PPCKmoa0jDzMxfCT7LE6/bSHaTMI2FEq1AOFBGXhSZxyUAEssFpY/512NOoNCT9m1HtI aCe6oskONsE/OkfCW/h0QE/S0fV+hcQqt4+9hFiy7N8NRlC7Q6ial41jyEUwxhpStM2V 3ibg== X-Gm-Message-State: AOJu0YzSOMfYtRN+Xvuy2xN0YWyArTFrFSWIxDuH6y7GqPtme2EvtHPE AYUtcBAyMbQskZGJuCON+yJWKPARz3mzYD485GptFt/c0DvfyiyHd/E+4g== X-Google-Smtp-Source: AGHT+IFlC8J3tig75SLJOzJnby2CdEIgNw5TbvRPkdiINEcE8cdqWbWKeixRsdzMxBNJCwM/nh7Cow== X-Received: by 2002:aa7:8888:0:b0:70d:1fbe:b96f with SMTP id d2e1a72fcca58-71255217fe8mr1307214b3a.21.1723485468274; Mon, 12 Aug 2024 10:57:48 -0700 (PDT) Received: from [192.168.0.14] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-710e58a8f22sm4277112b3a.46.2024.08.12.10.57.47 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Aug 2024 10:57:47 -0700 (PDT) Message-ID: <762b67e6-57f9-40fd-a12b-86dbe296461a@gmail.com> Date: Mon, 12 Aug 2024 14:58:03 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240812165156.2433-1-jamrial@gmail.com> Content-Language: en-US From: James Almer In-Reply-To: Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 8/12/2024 2:55 PM, Andreas Rheinhardt wrote: > James Almer: >> 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; > > This also changes AV_CODEC_ID_ADPCM_PSX; given that its max_channels is > 8, this does not seem intended. Will fix. > >> break; >> case AV_CODEC_ID_ADPCM_ARGO: >> nb_samples = buf_size / avctx->block_align * 32; > > Who says that adpcm_dtk is stereo-only? It's an audio format only used in a bunch of GameCube games, and nothing but stereo samples exist of it. The frames also have a header with per-channel information, and it's always for two. > > - Andreas > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".