From patchwork Thu Jan 13 01:49:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33309 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14202iog; Wed, 12 Jan 2022 17:55:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvy4rX/Obw5WjUV0oH64ISass24CMkQsVmlP0QhvFY8uauHqs39HotwS5K3IehGWGRcvwP X-Received: by 2002:a05:6402:2707:: with SMTP id y7mr2196760edd.256.1642038946900; Wed, 12 Jan 2022 17:55:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038946; cv=none; d=google.com; s=arc-20160816; b=kwPmip2LvrKH4lghFwYiyHSfYLREgixwLOrg+8+nhZiJ6+ftMn4tSVISot4WjP5q7s qpGG9XeA0Y1X2QUfD8j716G7XBPEPKGz7j4mEDqJ0Q9N26t+AeZR8kiouLYAJlp87KLV uCtKO4if/dStoqLQsSZUkrRVBQe3vl3LlRbx+5HnDoYLgUXpuliDukUWCC2MVisEtReD OisMTMVqu0YHp5paQu48gYzKXSsTNpay1J1l/vGE1wj6xk1RQ3rSdIlPjUBuhjkkck2J Czul/hhKIdV6Jg4roMnj3vZmxlqouxFjWnPDsdehlGgT2kramklT8BLR5qNCwRyfqSSE 4vAw== 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=z3tNVlLmGCEq6yM61QfN1ySrbM/tR9qE2nSme/Un6R8=; b=Pua3g3tVIkBn4R6jTgBSLVFfiXuoXjY56/J78hJ/kVaqCkEhYFIXbEVGLskS7R5fMZ i53pKYcsV+YZd4AX6l1NhZAmGqQSzVB9lrI4mP3uq5kQVH2H44SAQaHvErkOCcgpYNFa rPCCDAwuMt1cs07oBrrDK0g8Q2NyKShgG41xLI07bUssjuh3T2RJbRW27UgUPPFo1nJK hPku+hbmyUQuN6SqT6XVPnrBcZHAZp7yMybqZYgOg7SO6uMMCGOl69JvsgZuIuk8eLTk Icqt1GVEnbO8bNRiTWqTUN3bIZ5EAxW/7fI7guDsHBTGdhKDOHVK+3ykH/w0eQFDIWp5 KNHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pFR0LQ1b; 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 op26si689694ejb.31.2022.01.12.17.55.43; Wed, 12 Jan 2022 17:55:46 -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=pFR0LQ1b; 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 08D5668A3B8; Thu, 13 Jan 2022 03:52:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26D4668AFAF for ; Thu, 13 Jan 2022 03:52:24 +0200 (EET) Received: by mail-qk1-f169.google.com with SMTP id t24so5523777qkg.11 for ; Wed, 12 Jan 2022 17:52:24 -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=8fB97LxUkl07iM8cO0JHGK3bOw+G6t0JkY/LjJupK0w=; b=pFR0LQ1bWAasvS8S4PArSv5qG5HpJw08xjX1h2OFVMoNYOj9fveboHKVA+TXRMDB2C YQfa2wpBJSrFQthw3e8yjM8WFx/nQ5GwVAvXtBsLj0FDy/RF/3xKQKq4RIY/c8mfSFyf oC7TKbsu1gPT9MjVz6v6eg09UdmrV+ULR6o7ir1Do16xUllQXCpjUiPoopkprATGMeKM 9MufP1nHE21/WdI6j6uPDg48MmjxhQ6mMqKS3pU8QpryO6Ubbg38Qfn7Cjf95HFlGojV 7V+yHWIRJv8LQ7PcXVuFy6bP59tRmJ3jLq9pnzGpVWMWpYNh8a1nv6Ea/8pxlVOerUBV 2dsQ== 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=8fB97LxUkl07iM8cO0JHGK3bOw+G6t0JkY/LjJupK0w=; b=LrKGPW2AiZM/teZEySozZ87RlHe3vKVHSTLAvTFMksjQoy9Dl9yVxqL2nT1ZVJIRVD ubTSUUQpDZIOzenp/IMvIqucmyvQ1KceFIi7HI89/isq7Zp6i8J7/yTcavT6Hv22mpzh FmOXGaw6GSwh7ul5No3DtMG/9LJnAXZ4Ybzt5F5jzyKo108lcadWMuCYuolx9v/bv0zY 3FCYlB0HiQs3LswnKgI9fF6aAgbQPpEX6lv7pIa6WfgrACVwmOm8d1hdA3F0arsdXERy RFGzy4z7F8fICLaNB1qlh++AFTaPg2ChnXCdLAU9koGIW1m1yWXleDqe6c8EL1CVMubM V3JA== X-Gm-Message-State: AOAM532sDS0TdpyL3P8S76y+JvxSi0/agut0BINv3aYRyB1K342OMF/Z qvIjjfw0b01RV3SavY7mKhrfX3ZOM3Y= X-Received: by 2002:a37:e112:: with SMTP id c18mr1847076qkm.508.1642038742774; Wed, 12 Jan 2022 17:52:22 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:22 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:41 -0300 Message-Id: <20220113015101.4-20-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 019/281] aea: 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: FlVHzWQfFc3m From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/aea.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/aea.c b/libavformat/aea.c index 14d0840cf3..f4b39e4f9e 100644 --- a/libavformat/aea.c +++ b/libavformat/aea.c @@ -62,12 +62,13 @@ static int aea_read_probe(const AVProbeData *p) static int aea_read_header(AVFormatContext *s) { AVStream *st = avformat_new_stream(s, NULL); + int channels; if (!st) return AVERROR(ENOMEM); /* Parse the amount of channels and skip to pos 2048(0x800) */ avio_skip(s->pb, 264); - st->codecpar->channels = avio_r8(s->pb); + channels = avio_r8(s->pb); avio_skip(s->pb, 1783); @@ -76,14 +77,14 @@ static int aea_read_header(AVFormatContext *s) st->codecpar->sample_rate = 44100; st->codecpar->bit_rate = 292000; - if (st->codecpar->channels != 1 && st->codecpar->channels != 2) { - av_log(s, AV_LOG_ERROR, "Channels %d not supported!\n", st->codecpar->channels); + if (channels != 1 && channels != 2) { + av_log(s, AV_LOG_ERROR, "Channels %d not supported!\n", channels); return AVERROR_INVALIDDATA; } - st->codecpar->channel_layout = (st->codecpar->channels == 1) ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; + av_channel_layout_default(&st->codecpar->ch_layout, channels); - st->codecpar->block_align = AT1_SU_SIZE * st->codecpar->channels; + st->codecpar->block_align = AT1_SU_SIZE * st->codecpar->ch_layout.nb_channels; return 0; }