From patchwork Wed Dec 8 01:06:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7045017iog; Tue, 7 Dec 2021 17:09:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJx5Z+IFug3oW61Ar3i7HofwHr9qVErv/tx/mOCkEkZsAzmS9A3KJdB+he9Iz2DAmq+5ai8Y X-Received: by 2002:a17:907:7e8e:: with SMTP id qb14mr3471799ejc.562.1638925788068; Tue, 07 Dec 2021 17:09:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925788; cv=none; d=google.com; s=arc-20160816; b=DXhyz5dDZ/vi5Xpracq0pOZXSJOBrhCyI2/sWGvIZinSxlJP/F9yNZQZLM69m1qwJm aH3k+84O7A+XXKtaSJaEbbKE4Ii63QKs+IrRh79fz7/6bgWSbNHUSGcQ/sUAmbkn3CXj hxX60RrUczj9wthut3I+imW31qw50DsaZi1JO0a5KXV0Lqne2UQMqZiIGQZOdmURs3MW qna7eJb7PRr5JN4FzkF4hVLiecWvHJfABQxy3+yjyWGPLxGgq3C3UN7/dSk+2PPHlhXq HFEKcAm1oYCNBM4m0Z+/0pTmddtoN2YtSy1Zfw5dLmvtA2H97ZCkX3Do22LGEFiinG6o BDLA== 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=tymdINnAQOHnirbGMAFzvJcga4GDjx0GpAh1/P2LcTno9jUtqT3e5iYdnnka7Ez+7k 7RXlxFGOOhmA5zPNW2U6uCEkJDPZLfIgYDKGW4KY4vlq/jU86wFx+nBx2B/58RyxKhSm d/3lBxiNgm0IhiF8BN60EpQtTnOVabIs6Cx53v4NafpUMNPr3ofNVTThCmY5GxfE56k9 SEpz/jp9PTHgBduVQVDo6wddvdt275j1q1H9tmACqS5cFXUsgedxcbNtQgAV32JdsKvC nOZV3fbo08s6WN6KbaUCKB/N1mNLuSd9QRPXvvFU8FeGOI6r5NVpjHoWkca3SGIa2/rt bsmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=joVYHZvY; 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 i10si2055529ejd.303.2021.12.07.17.09.47; Tue, 07 Dec 2021 17:09:48 -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=joVYHZvY; 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 1A3F268AEBD; Wed, 8 Dec 2021 03:07:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f182.google.com (mail-vk1-f182.google.com [209.85.221.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AAB7668AE9C for ; Wed, 8 Dec 2021 03:07:44 +0200 (EET) Received: by mail-vk1-f182.google.com with SMTP id e27so579493vkd.4 for ; Tue, 07 Dec 2021 17:07:44 -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=joVYHZvYlYFB/ub8yYtaNnEdqGhyXVjC4voZWJ33BiDLkM5O8qFAjf76WO+eiEIbTg mPqpTRyz1Hy5TYpXqyAc0FvLWhhv9YHAHai/1A0bfG0phb9EIvywbuqc/UHoHGKQMlw9 ZIdUuO3qWVIa/1E2hifyguEuTlIWjBMHAn5vddInfGZ2JIJcdktSCDuSRhFxeb649gxa jv5MkugYiDVzvjD5njyJ8O2QOo28vzqHip4niBaL1LXLdwfWsSlYux/DtkqOpNYpIkbA OErVJRf2GSAV9ujQSYqz4Cx0fwlT1eiGgPRNFXXBEGwYoitxgcy44Bs9aRGp1NhQyuFH ot1Q== 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=umBPlClkcCmz5BVA/9VVL49RkXBBcfkinwvgefNakPazkwhdZaDg9/mLQKRSpV921v xBez01So1uYdP/ZI/l4ERstc1EtxewNUllFR/GCZKPcYfeWM66AdkLSBlyBGztHMaCgg og89Aoc0OZMb92OVuoElMqjPwzNBHr/X78Y5SkNfOMZGMEJ+0xgQ0JtqJGR3Fng+Rers OpWEHFANxja9LwukB95UhwozQP3Po40+rS/PLqWl9bMJ4oww0UOD1FD9CV2rmKTC/cYB 1xsC4meORyBvZYBxkMpaX19ixhryGQwZyu6hOf01RomOZxuveoF1eX+EL0V2dIVOMdSp VPkg== X-Gm-Message-State: AOAM533MOE3cYx2T579HeANyiHvaYI3JnLApC7/Zmv5ndBnqP4ozKHDV 11lM4x2prVYZ3Xq9R0WvyrJVqgx26crw/OU8 X-Received: by 2002:a05:6122:1354:: with SMTP id f20mr57561299vkp.12.1638925663009; Tue, 07 Dec 2021 17:07:43 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:07:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:28 -0300 Message-Id: <20211208010649.381-13-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 012/279] 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: f4FBrn6Pe9o0 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;