From patchwork Thu Jan 13 01:49:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33302 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp13491iog; Wed, 12 Jan 2022 17:54:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9ggpx/m3FI2nFxNyrTf4prxwIXMcqX2y3b+PB7w5YZxqFcI3HVgrbESqsvP1+Atctrw1F X-Received: by 2002:a05:6402:1907:: with SMTP id e7mr2214378edz.44.1642038872290; Wed, 12 Jan 2022 17:54:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038872; cv=none; d=google.com; s=arc-20160816; b=hfAhtNKfQr12qtB8JdSpJlGA8ZVsEVjqnYeZGBzM3r4kQiaNtAdFkDxAgvKEi8//nG vq6tvLmnyiYGhoi6NTljmqPujp1TAuwQEqeYfxiMo3PnSiabdVJUjZTB4jxMPYz881do 48DcU7KGCY/XdjrrQJiIMgI/uQUWixd1BjmMKqOP5/ZinOeuiPsSqCJe483m+LYOim+o XYoE9XL0kYcmNpiwHnOHJrC+JnS2SVkqnfABfb1IzbHPWmY5FZ9jPuUNZ1E8tmRavrZf yHQzaZWcPt/Jl8XZsFMBivSW5sRYNwRR1wGoTyVj+pLkO5wJQl8oxRfAYpFaYUgZtFnf pb/A== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=pGxznPd1fEnY+uM/FUBnQHYs33yKLuYvJeoufTKGGeg=; b=tdfhLc3HXD1anVu1Rb8xNJ21aH0+7hLn4ik28HZOJyKdCpsThqWr2nKjx3bBH0s1qv ovaCi5zFxlTgUL//Vw3XraWwnq1QtY2nVC824SVztrFz4rEBvBC2IKP9j79j3iugAqll Ef6aAKrCKxdwAHn6o3LYRDre4mdT90+HC67mTE0tjHwGNzY9+7m3xNRnpGEJwTxiuCTh Q+oU2HnQ7ita3v2mstg33BwaT5gf9CbnZLe3J34Mxtk6rSGr/X8Sz0TCh5xScqQa+sWF E0cZCpdzITeIxsfxC3gRj2xhomF1PpJv4gQjLOfqaKql4WTEMGRrp+jlDICyUtJQvrPi McsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HqRXLftI; 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 z11si902339edd.567.2022.01.12.17.54.31; Wed, 12 Jan 2022 17:54:32 -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=@gmail.com header.s=20210112 header.b=HqRXLftI; 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 B6ABF68AF8D; Thu, 13 Jan 2022 03:52:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3699168AF5C for ; Thu, 13 Jan 2022 03:52:14 +0200 (EET) Received: by mail-qv1-f47.google.com with SMTP id r6so5031320qvr.13 for ; Wed, 12 Jan 2022 17:52:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=512ft/qic8Yd87jhP0QsVsYGC7Jh9q5jFrMNMxW2fwU=; b=HqRXLftIPs03LygGXKqzCuJcjnrOUjYp0PdPkFxtAtMdLVgtM8Z4PzKUbH8ci5YEHX GrskM0odmKu6AT/mEVAtVfX/dI1yRpltp9tN2P51ifqk6wBePGRcjKjp9VKZzBfPCwXu UAkl8mZbx2XiY+swelRsSfnTd4tlxbrBNRLa/oKQvGwq29clofb+3611GEnBoM1Yhnwn RGUgP848yypLtDOMw2UVHPiUVdvOFeuM++XVdnMug8rd8dz1j1bEssXxQmaD8yjh+zGt AP8AERou9IDbBJrsBEnJkSrebzeC/RkPpY05DBnEAj4RTj45YzMcmRMmI47krW/ciAj4 yX/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=512ft/qic8Yd87jhP0QsVsYGC7Jh9q5jFrMNMxW2fwU=; b=eI7UyfyhJOgn2jbBFxwvGd/rGokAHDre5w16Yv10imEb9XbfT4c1SsqaawU8m1XaYf 6Lldsj5/sSZju++nQrs1sYHsOs0sTtlbYFOPp5SXo0Gf/XxBbDY9aPkCrR7lZUslVMhf f177jhPiUab3Mvld+OhpbIRJBk7wMvoLVfFl29dSR7833xKXC9vtYDn8D+PioC/FcoMs BHwQwy8RzKLkpU3BdDZKBr/f2/4/8UxTvTfDZhREMefPZLi5mdAo39gTrrcIO/RLndXJ /xQGEGKPi3vsGQWjotI99lxG3G2JoGpLE+8+q+/fA06YEstLyP5Yu6iPKgNr/78d+KXU bGrg== X-Gm-Message-State: AOAM532wqdyxKKGXNL3HTjh+OYksWW85jJFaTjqDjSHM4lnwg4BiQALn BIJLrkVPY7nl9Dw4xs1rIyWLRY2slcI= X-Received: by 2002:a05:6214:c24:: with SMTP id a4mr2060178qvd.127.1642038732810; Wed, 12 Jan 2022 17:52:12 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:12 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:34 -0300 Message-Id: <20220113015101.4-13-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 012/281] aax: convert to new channel layout API 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: 5Z/TPZIqlyhn Signed-off-by: James Almer --- libavformat/aaxdec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c index b08ee036ed..8eb2540407 100644 --- a/libavformat/aaxdec.c +++ b/libavformat/aaxdec.c @@ -279,9 +279,10 @@ static int aax_read_header(AVFormatContext *s) ret = ff_get_extradata(s, par, pb, extradata_size); if (ret < 0) return ret; - par->channels = AV_RB8 (par->extradata + 7); + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = AV_RB8 (par->extradata + 7); par->sample_rate = AV_RB32(par->extradata + 8); - if (!par->channels || !par->sample_rate) + if (!par->ch_layout.nb_channels || !par->sample_rate) return AVERROR_INVALIDDATA; avpriv_set_pts_info(st, 64, 32, par->sample_rate); @@ -299,7 +300,7 @@ static int aax_read_packet(AVFormatContext *s, AVPacket *pkt) AAXContext *a = s->priv_data; AVCodecParameters *par = s->streams[0]->codecpar; AVIOContext *pb = s->pb; - const int size = 18 * par->channels; + const int size = 18 * par->ch_layout.nb_channels; int ret, extradata_size = 0; uint8_t *extradata = NULL; int skip = 0;