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 3FC2D4AB7E for ; Mon, 12 Aug 2024 17:55:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 629AD68D6E3; Mon, 12 Aug 2024 20:55:17 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2058.outbound.protection.outlook.com [40.92.91.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9065368D6E3 for ; Mon, 12 Aug 2024 20:55:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TWcTT6psaPgQ1PaNEqrUQL/LYVaH/oLixrLSQh86ppJQyXjwCaIxNleO76ZBrzJgg4RkzdVXDoO1TmLS9Clq9hGB1HsWyZK0VD5TWjLDCvah35akIOtPaNfdEd74iN2Y2wfSmwiNMHSEDUkSeS2jAFyZiTy0K6RoR/HzqGXhWsgO/Lpwn60CE/N3xDrXhOAVXv2nvAu/BI9jxDIP0qvylsPec9cu1IVcmbPmyIMcOgGFzLC7+rQuTbkql2+Ka00URx08X2PC4fq494IlozWh5F1TYSJYL+nEnrXfvRlQv2ejqeIKRYf25S6WmhwdHrPJIh7TeFLrZxqA5HlGCtvmxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=muACTvIkL+MmTwgtzRTnPSwcDy6YjMdvEyUc3hAu3Q4=; b=hCdF3pDY8pm22nxPnYRfAhuRGKY6sq5YwOdte9qo3TTmrsqBcIGaWpJQy5Mj0TTFlZFrAhGS5B6xE+DY8xoPPkBsdXaqNsizJrsLV3+i8ICMmR+XTom0FQ0zsRboo79LPcfxOXoC/VVGtAnHhaHZvhPXhLQZTZg8lMlZiz22myT96VGm26nE1H6i/WktuiltKAP4MKygyOXXvRlB7c4lgkoxnWO/2eX/a/4QYNF66RPpBSlYp2LjiWy5AhZ2yEdMug9mdur4tLv44+q/VDgEqSHuvrxJy6A5R2Bigy05Emgyj9UCPdmYz+e/t73LTxfpwkpaGHMWG1GqJlu3eIxcHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=muACTvIkL+MmTwgtzRTnPSwcDy6YjMdvEyUc3hAu3Q4=; b=AxAxYlITX4zFTJ3WQhMA945YdwTQrM18pipzPK3VCjehBBUDVwH/22xJlnpDQIXrNS7w5J+1raarknIzjntLtyQWLb/2SlDNbkcJCHef4v2j4CbwgfV0Veb1xwjuDTlzsHyOdorQM5XWy1D7dht+nvQ6cxgBOFyh2D+ra0MOnX22uZO1RknB8k9L+52iI/0KijQ3tSb4UO+1eHhrwsOe+J+5xn4otqGwGddv1f2UCdT2a42Qb6RQ39FZFb7zeSYrNweWx5QEW/z1rcDmMGtkKmBkmzxciH6AZFeIjoE02llvJvMCtda/cNbAxobGmDJ+zE8AHBdBJzselHnTJxlX5A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PRAP250MB0515.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:292::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.19; Mon, 12 Aug 2024 17:55:09 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%5]) with mapi id 15.20.7849.018; Mon, 12 Aug 2024 17:55:08 +0000 Message-ID: Date: Mon, 12 Aug 2024 19:55:07 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240812165156.2433-1-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240812165156.2433-1-jamrial@gmail.com> X-TMN: [LYfq4NLIXDUylqb18ECJF/B9qMjlkVkBWVX1Q92zi1E=] X-ClientProxiedBy: FR0P281CA0065.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <67bee01d-a082-451d-ac3a-62c7e0add1d2@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PRAP250MB0515:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c9e04f9-84ba-4af4-3ee4-08dcbaf7e7ac X-Microsoft-Antispam: BCL:0; ARA:14566002|5072599009|15080799003|8060799006|19110799003|461199028|56899033|440099028|3412199025; X-Microsoft-Antispam-Message-Info: 2YvzNOCZQVhGhV/0VwEgLQZaXlS+OxTlgNuaocb6B759163Hj2SEpHtxuQr3ZEInjxiIwhdbHYWbxEiYQCtmlk26ooBGjYahiIIeBRJajTr9XOjIz3jbxOiZS3ZEv5X4koAVS4LWLpfbztiHtHVRrBlqmwnNzetCEokmgoW0RCYtEWrho3kectq8E1LRCKeA1qZmaAGv9wMCIIipet8XYVo38fwWWkoWK6WOYTD1LAgJWCtVQi9BpsYuCrKUdxiZ/1Y0jUn1tLAhWqH9dn8qEutlTwqgNNALy0HC4/23DXRD2fAmVfOauE0ZereWS/nsqj3V4n+KAvDYbpTIddtoqFAoKRucbo/F3iU83XuVre9B9EusA8JAuvsOSxViLdubfkAa96P6C1hbMMA0QLLl77vIN6MM7wQA+cv8ZdbbwJY2xG2kzfI6rlThFwKHyt+mFaEsY8j9tJ6GzmD+CuPKgfxmBgF0YzR0wXIpQGXyagiFSqFXa3mS/wQj+yiQyK7Ka55Z5Iipl1YL8hSb/7r0Z7LWWUmQRkWLCskfe0kDTU5SRx15q3AE9l+nH626z0OSR5JTi1Ka9K8r4Hp/CkLPnmZ1q0fy+AInksXnIg/HuqlHPMqQyQXCyaYjm6Xi1qqOgx5ePptzOuONQ6b64lQTpeNFngPSq9TxeuN6OyUTlVfr9K4UVnAsiOq+7qcOd/aaUvFaKi3qDBNAU8j2Ntf4fQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bnAwdjRXM2JoWGVWU1cybnljejNlSnAwbER3QlVQY1plNGo0WmlidDZUMHJO?= =?utf-8?B?dzFVZW9rOGdzZ3lIL1dMSE4vK2szamJPQnUyNUVzZnRIZ05jV250ek5zZXR0?= =?utf-8?B?ei85MXY4ZEVHV1grOXpKa2lOeUJ0NEhLWkNTNmZVM0UzOFh0amZBd204a2J2?= =?utf-8?B?dWdEZklzdkJySEJFRWUyWERtSDRGYWg4ajAycVlwTGdJbjVqbyttTFVKUUVQ?= =?utf-8?B?RmRJNE9VUzhmdHU0d2JqT3FvdmhDR2hwQkZGcmdwR2dNU3FSUzhhVGUzZm9w?= =?utf-8?B?SVF3OGJxYzk2ZXhyQ1ZzV0NPTEkrS2phcmFYcWkvTXVPQUp5ZWNrSmFxUWg4?= =?utf-8?B?TlBrL1RWOHNJbEFYbzArTXlVTkg3ZFpPYWExS3JRclp2UTFHSnk5V1BJaGNx?= =?utf-8?B?cW9sd0p0NFY0aS9RUkhOQ0dWQXJEZUN5OWRjNnhsR0VBR1E5WlFLS2FxUlZw?= =?utf-8?B?Q2ZsMXNwbGNPMEZmSjh2elVQVGhKdkdJMms2dGtTck5UNEgzZC9xbnh5bDly?= =?utf-8?B?eXJ0SmttZmdpakUrU1hNNlkxYWFIcDlHS0hWS2p5Y0pCS3FWN3JNd09pRWFT?= =?utf-8?B?Ym55RXI0MHVPVTdHMG90T0FaOEV5YVdlbDdZN2puckN2WGNSbTJ5OGsweHNG?= =?utf-8?B?dkZBcUxVWlhMN2lzU2l4UzNXeFJ0Ym1rRTk3UkRWb1BsTU0zQ05NR1dmaXhJ?= =?utf-8?B?ajczS21sVjM5SVVucDdrS1lOT1h3eTZBcTUyRmVweUpuWm9HS1JtbmFZdmxP?= =?utf-8?B?L2VuaDdJYnZJYTlZWWFNT3FHRDdJS0JsSVRpMmpUYUkxWGV1L0JTdFJnRHdJ?= =?utf-8?B?b0FOa0dNaTlxZFk1NkorWWY2N3R1ZGpNMFNVbU5JcUF1bmJCMURmdUtmTmE2?= =?utf-8?B?ckJLeS9HUGJ1cjRNSFdQYVltaXJWcm51WE1SbkovMVJUUkVuWENaMUFhSEtE?= =?utf-8?B?Sm5JeDQ3amtMMVJxM2FZWEJVSlRtK0RTTUxybTZKM2FtcytnNlpKZEF0MEdt?= =?utf-8?B?b1FSKzdVV2w0Tis1MXlTMEZOYmEzTjA3c2pkZVE4bWpDaTVvRGt0WDNTOG9O?= =?utf-8?B?ZDJ6bEd2Q1FGemhHYlpkYnhEOWxKcEtmRWVxeEh0TEFwQ05vSzAzNzI0VDVq?= =?utf-8?B?OWRBMmJSRUNMcGNMTkhjdjJIOHAwRFhBQnVaVll3SVZkZWVhSnFrMjNvbEZy?= =?utf-8?B?VGl1Smh1LzRPYjJvbnMyZXhKWU1DZVcrKzBOSEErT3F4NFdVNWl4ZHRraFEw?= =?utf-8?B?TWh0STBYYk12a2VkK20zMmdQQjVibUFYK2t1T2RGekRzejF5SDJQSjNQK2Nn?= =?utf-8?B?NVNGTzcyTXR3SUtiRDl4eW9ZL0t2OUxKd1dyV2dNSXRPN25PdGFLaXRaeWc0?= =?utf-8?B?aWtMcE9UakdpZXZDKy9BV01IYVdVekJMZ3lhQ3JINFVjZ29oUVlWZktoZVIz?= =?utf-8?B?dDhoa0tIdmFma0JpTk5hTktOQ3ZBc1BLOEV0SEV1bFZ3SGE5YnorNGRLOVQz?= =?utf-8?B?azl1ZGY3ZVRFa3Q0S0orUnorTEYvRk02aktudlpmQ1dwbS9Zak5KaWJaQzNO?= =?utf-8?B?RTQ5eG9qRlVUYVRBZHcrVm02NFhBdnNRd2MyZlh4bkpuWXZ0bTA3aWZMbnhh?= =?utf-8?B?VWpYVjBZWkM1Y0ZJMTR6bVdKaFVXTGZnUzlnWUNFK2x3bHFSSVk2ZGFoSGpp?= =?utf-8?B?d2g3NDNabEF0RkdxQkFIQm9yODJvOTE2SEx2TXRDNlNnVUVzNE5MZWxRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c9e04f9-84ba-4af4-3ee4-08dcbaf7e7ac X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 17:55:08.8844 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAP250MB0515 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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. > break; > case AV_CODEC_ID_ADPCM_ARGO: > nb_samples = buf_size / avctx->block_align * 32; Who says that adpcm_dtk is stereo-only? - 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".