From patchwork Thu Jan 13 01:49:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33301 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp13387iog; Wed, 12 Jan 2022 17:54:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbDBvf9xjoXs8iUMlF8SMheofm6dO8rMX8CecB+QMCYFVAfT1aQC+0RNuYbM9rqVC+xaRb X-Received: by 2002:a05:6402:2142:: with SMTP id bq2mr2142726edb.5.1642038860807; Wed, 12 Jan 2022 17:54:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038860; cv=none; d=google.com; s=arc-20160816; b=JjlNFosDOg7Bh4ipldo3ADroH0a5iN9H7vsDewzTgGGJkb82kFd6SLhY6kg5c0PTXh jPr0Edquq1S8GAgYMC4ZaCZUOLthrSc1zgRd84HMXmr5JQ2B8pzSVzPTNvomWGee7jYI dZ9ES7X1GZMgi+sO510QV0E60/LYg55OrHipLBfXsKyPXpD+OJ5SgLrMjirIZVEV0+nb kutDZ0OsO4ORwU5w2K3r++7BPsOZw9kxo8/EQl5zSscUdj2sGltkDzurUsX6RzHCQKv7 Y6mP2GA+lmdoOaK4DMGJte9dpaJxwV638urldXhOG2RnQktKV1GGa3Jw7O4q1BnHp9GX jBrA== 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=Wx5RGDn4wfQY7dcW0T8WjOo3NTFvEskXHGYaDBFDAaQ=; b=XN02MsfYXImsMRkOS3eADpmKuSP+oZIx08aAP1Zfvg7xFeJ1n/9Cs7e4Rv/s9qCFa4 koAMLx3rkTLspVyCn/2C0teBfurFPB2RxnFTXC1x1M4uArISKuAH1xLIIAu1JSi4rb33 /ooYwtL/tB48XNhdBRZSC5z1vOLbC7psyloGQVxXIggcra47RIilhHiVnvH9VHYajQrQ 41JTKsJIYqbeB1OfA2zgw6LT0CH1r1HF8p5J9zxUwZtG+pVhTuhyJd4RPWHtQzQCfDm1 GKAw1A2OVl4nGzRqgHdIj9YC1iU4L0L3SO7okcwN3eLAF49kvXPq/aTGiKBPXGT46ssV 7Cww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=SGxHNpao; 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 q6si770111edt.543.2022.01.12.17.54.20; Wed, 12 Jan 2022 17:54:20 -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=SGxHNpao; 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 C781C68AF6B; Thu, 13 Jan 2022 03:52:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0695368AF41 for ; Thu, 13 Jan 2022 03:52:12 +0200 (EET) Received: by mail-qv1-f54.google.com with SMTP id jr5so5050486qvb.11 for ; Wed, 12 Jan 2022 17:52:12 -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=Io/MtYUorAsGd+fFqZuX4KJ79PA5+5brnMAszQP7yXw=; b=SGxHNpaoKs4J6PBEcatzWPznf47sI1xUsc5SZ69DEX60xk+5hHcaXF5WfeZ7rN0zTB kZR8sYpziTGqEHg8jjiK3maNGhFh6llMrRryongDsQZEzLX3HR/0PT8uih2/vBFKvR5Y 3rRpYZJVTKLA7lvL+0YnUGmo/hXiPhQNLxcKbqtGit71zL6a0aqCauj0vhaNPei4II/i c/LwdjQMtRXeNtfRp6sOH9hc2G3ccoDDP6K1SwnUaR50OG3mC2JP+ym+x+56Ds6r5zTt HITH3lhC/Q8RAgG586AHP5m4TwW/xM1UqTzK73k8YHpPO3PZoXBFjhhZjep+vr5VGd9U hY+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=Io/MtYUorAsGd+fFqZuX4KJ79PA5+5brnMAszQP7yXw=; b=o34AmlEByP4c2oXAQRz1Mlt50p90LhZF4tPYeS6gWXQyHgd5vo9uX3fDVZTsDUAOXo MkQXQdV5aJgZj4eTaFX6rYsUQgxcf3GHh3Z2XnI6tWL9Q8MyvhF6M+BO0dGcJ/zrfRo0 f0KIXys2JFD6206o6j+LsaJvbstV0AwQOW0yBszDqTeSQNSxttSF9tfuN7QfyLk46Bo1 uEZS7zQCaJp9h6XjzJ1FmE66sV/vQZBt91Xcs3D7TRZZVzxFvcLFRVyoJsRlLWE/ppVw 2zI/ygNB8czY6Fv01wV0OATAXP+EMQfnaUTKJ4VlXPMuHTJZatyOF1eD2qeZM5xcvxDc lQJg== X-Gm-Message-State: AOAM533MdrIRkWPV1xgw2q6ys29gkN4swiBHiGjoCpnN/jMeLQe6N82r 1yZ3F/0QVBomg/FRTHq/G/KWrG2JaHE= X-Received: by 2002:a05:6214:d01:: with SMTP id 1mr2179868qvh.34.1642038731591; Wed, 12 Jan 2022 17:52:11 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:11 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:33 -0300 Message-Id: <20220113015101.4-12-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 011/281] aa: 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: zu9eHRV8NK9c From: Anton Khirnov Signed-off-by: James Almer --- libavformat/aadec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index b8a5428f1f..cd275aa2f1 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -178,7 +178,8 @@ static int aa_read_header(AVFormatContext *s) } else if (!strcmp(codec_name, "acelp85")) { st->codecpar->codec_id = AV_CODEC_ID_SIPR; st->codecpar->block_align = 19; - st->codecpar->channels = 1; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 1; st->codecpar->sample_rate = 8500; st->codecpar->bit_rate = 8500; sti->need_parsing = AVSTREAM_PARSE_FULL_RAW; @@ -186,7 +187,8 @@ static int aa_read_header(AVFormatContext *s) } else if (!strcmp(codec_name, "acelp16")) { st->codecpar->codec_id = AV_CODEC_ID_SIPR; st->codecpar->block_align = 20; - st->codecpar->channels = 1; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 1; st->codecpar->sample_rate = 16000; st->codecpar->bit_rate = 16000; sti->need_parsing = AVSTREAM_PARSE_FULL_RAW;