From patchwork Tue Feb 27 09:49:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxton X-Patchwork-Id: 7755 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp2366240jaj; Tue, 27 Feb 2018 01:55:15 -0800 (PST) X-Google-Smtp-Source: AG47ELtK/t7y0LvP9bRUt/tc4DXjBCODZyrQ3D3XFo6vVE/fhReV97otF+9IYTfsJFRT023VLVLk X-Received: by 10.28.239.8 with SMTP id n8mr8285174wmh.120.1519725314938; Tue, 27 Feb 2018 01:55:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519725314; cv=none; d=google.com; s=arc-20160816; b=Uoc5ReEfbSc90Xn4a/aUWpORkVeAoZBv77mrsj3x5buvZVLKZfJ48tceRI0wVd83Rb awWjP85wpOu67VF8mRnpS++tGrd6U0M2X5y4WGwBZZrsOJkiYzyTlGHI/VlDWgva33qV 7lm1mz3hRwAtAsd0+mO/Zic6uw0/IMEHGHcg09b2Z4rsUGK8CmnZkkoWdpNi3Ia5nfjE zPo4B571KnSLYt1DP6UAEpq5fOGtYphwtMpVZ+pAwC8fHX+P6HaP3zulJ2WELfl71V+j qhqo4H74ohFVeqdkGnIMKNp6pmKDlF6nI1l02uVwIr/fKVsgbWGG/7//6oD9G8Fu0WyW Eikw== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=RjRKm0jMisxGsZcXPr38OGJ+2qyDErN8W02FJTRGn24=; b=oUJhz/iSJAdTumCO23EWez56vKaegqj2+yEpILGufhtUJYpNiZ0nAUj/gNRm3chtNz fQOcyc8K7Zjl96WDLKlw+tHO3fh3FyQtNHXBug14aIlIee77+E+N9yLlzhMwIk4WXhlh fi+wJ88VMnWoWJ6OZxiygUy6fEL5OywLheXchNdkfdKd1Hiz06Bl3HjtDEahpRt9xrU0 fvgprSK5uPnjhIQS9m6kboGJT5BB9qxcBR9nnC54trQ/4LAlIIXnsTOLpxcxB3LPMt4b jZPaYBRqqo+kLCdZeAXj3jjkfucJfhHDfGqlmdR9KYH66pzXk96slCXV88jEHehTW5r0 GK6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@max-ton-net.20150623.gappssmtp.com header.s=20150623 header.b=frsLocNO; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 11si2663994wmd.198.2018.02.27.01.55.14; Tue, 27 Feb 2018 01:55:14 -0800 (PST) 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=@max-ton-net.20150623.gappssmtp.com header.s=20150623 header.b=frsLocNO; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B74A68A389; Tue, 27 Feb 2018 11:55:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f178.google.com (mail-qk0-f178.google.com [209.85.220.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F79268A369 for ; Tue, 27 Feb 2018 11:55:01 +0200 (EET) Received: by mail-qk0-f178.google.com with SMTP id d206so22741139qkb.3 for ; Tue, 27 Feb 2018 01:55:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=max-ton-net.20150623.gappssmtp.com; s=20150623; h=sender:reply-to:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=3wjinulUiaw8SQx0bYF5ccVq0iOdAKNZHMtM+1ZNeus=; b=frsLocNOo3bzGDlkeVcuDmv5ABIxf20SUcqfcgGxjYIrpKO4Ujy058esa20+YpF24X OJFyfMkYZ1wzyz+77bX49fxUDBinV31ThDrCobHj6h4qms4JYZMgTd6k0+YcvOm4AIZG L1QiaVS67987sffk/1+zvHg0LYwIsk2ZNVc2E2RBSrCoFzDjEUcOsGCVrmVyv6AL1S5h p/aEHrkenzXbfHdwGnkKtQ6mQ9dFz52R9FwHHNFa3mOSZA+44cUknxokM/fVAUDCwLLS kmrtywZae2DSEngDh6NmvobZOr3Dglo7PpN+SwsO4Buv2yVHr53mB7olnaqsHOddboW9 b/vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:reply-to:subject:to:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-language; bh=3wjinulUiaw8SQx0bYF5ccVq0iOdAKNZHMtM+1ZNeus=; b=aq4w0M6N92zsma96ngS93jsI4wt14t13DzS4uviwR1CAdO/6CRr+LILw/zSIo0GiKD AYs3bRVc2x+ooXummrR1YIuXRnMvFGRkBmV8oiAjXjVTF8ugBWQ7Sxkq2+09mzNIq3IJ a5ZIQY6MdFiqsenKpiapQQmhvjNWmWI9Uz3dK2T4S3Amv9N/p8tcNNUzVWHb/umx7gPp jPHWAnnVovPlyK65B0uDbdCRGjoNg3Rdtt10U2HuC/BF1rwD4NIPeVLBY3PJ5lWxYwqI +ybriy5K3Y0P0KqxSoMwpNskmLUbBqR51zjjkG167ZA9biR/XdrqNVZLfloZsnORpS+A OHpA== X-Gm-Message-State: APf1xPDcizkDvylzPPkW3WAJLz6V0tWKKaOR/5EROuiCPwTt8PYWkYDV nhBa84hXAjTgq9jiQ3/ksYgh54E= X-Received: by 10.55.12.19 with SMTP id 19mr21975860qkm.277.1519724956223; Tue, 27 Feb 2018 01:49:16 -0800 (PST) Received: from [10.110.87.210] ([129.10.9.109]) by smtp.googlemail.com with ESMTPSA id t60sm3967003qtd.68.2018.02.27.01.49.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Feb 2018 01:49:15 -0800 (PST) To: ffmpeg-devel@ffmpeg.org References: <6e6ca08a-202a-72d5-51fd-75c3644df8d2@maxton.xyz> From: Maxton Message-ID: <5ccfac7f-b8d7-60c7-9251-0c121331c83c@maxton.xyz> Date: Tue, 27 Feb 2018 04:49:17 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Subject: Re: [FFmpeg-devel] [PATCH] avcodec/wmaprodec: support decoding up to 16 channels of xma 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 2018-02-27 4:10, Carl Eugen Hoyos wrote: > 2018-02-27 9:26 GMT+01:00 Maxton : >> I looked at the code in avcodec/wmaprodec.c and noticed that >> the maximum number of channels was set to 8, but I think this >> is a mistake as the number of channels should logically be >> >> XMA_MAX_STREAMS * XMA_MAX_CHANNELS_STREAM > Doesn't your explanation indicate you should (move the definition > and) change "8" into this calculation? That is certainly more clear. I've attached an updated patch. Best Maxton From 96fb5788ca2406b1c898fb637d4951d8f01ecb3e Mon Sep 17 00:00:00 2001 From: Maxton Date: Tue, 27 Feb 2018 04:43:52 -0500 Subject: [PATCH] avcodec/wmaprodec: support decoding up to 16 channels of xma Signed-off by: Maxton --- libavcodec/wmaprodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 77a49c9..9439bfa 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -107,8 +107,8 @@ #define MAX_BANDS 29 ///< max number of scale factor bands #define MAX_FRAMESIZE 32768 ///< maximum compressed frame size #define XMA_MAX_STREAMS 8 -#define XMA_MAX_CHANNELS 8 #define XMA_MAX_CHANNELS_STREAM 2 +#define XMA_MAX_CHANNELS (XMA_MAX_STREAMS * XMA_MAX_CHANNELS_STREAM) #define WMAPRO_BLOCK_MIN_BITS 6 ///< log2 of min block size #define WMAPRO_BLOCK_MAX_BITS 13 ///< log2 of max block size