From patchwork Thu Jan 13 01:49:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33324 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15855iog; Wed, 12 Jan 2022 17:58:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwsaox6TQw6zz5meynZovQnYICaB0HmjrF94M+E+eJ5XXV6Z1/yeUZKMhzlw/eVbeg6yVkY X-Received: by 2002:a05:6402:3588:: with SMTP id y8mr2229405edc.147.1642039136406; Wed, 12 Jan 2022 17:58:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039136; cv=none; d=google.com; s=arc-20160816; b=z1AQYglqIjDtXbK0Y++fqaWcsSW4l4w/TF57QrV2x9x+7e+D+d/4EF5Zm79pWGpPL5 V2EjFCttjmBmbTaOHhx6Qa/3w0oEYgDaQQedS2FRjHeoLn9eMhyUb/pijgOUYqb7pBnk eVaQcTrjtgNoBR7Se9rGrfdAiUWvD6ezDfRlx8RPPlz9PQUT/bGGnu6BoZTGXl/DEkgC yTcZPqa7E49QM9JmKXH44hFDxC8EZdpFPpEPEtdKcvmYVOkg7eDY5rroQYtT+yODMtXu /3rB35I0ck6AfI8DHY77go051A51oDRm9PxO3HbDBsM0cpSObKtCZK0OEpXjUTDMBI/u 8TQQ== 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=+CHWP3CzJpPhdd4tIK/yzvAfXCsHtrVyjcwuf0Ltk+s=; b=pYtkicf/4v11SMZhJD2s9tLjRB1f8P23Nw0XlIr8i/LlwTKEZ6W3FxAr6MW3cRskKj FMTqgLjaDJ9Ho95GWVJs2VaPItmLd8NcSl4LX4M9mJRia5fjvShEOvbNL5+p71yevX13 l+H4eNKAm26uxPBQ8XN7HhXLpqLlYVV8Pk0ePUsWRY2WD5MQ4HtcFn9jaF5g+BgojZO5 QoYWzIqTz+0MDOIOh4XnwvqUWYVyEgP3vRbFWq0gMPkK59CSlKhdSDEvVKQ5Nftc0B7Y KUqfyVSYruvMBw1A+4rSfAwP+fA8FVUs0TnO1XHfZ+WeOaA37eql6G9HFtngWWIXSAKO SU9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=T3IrmJ6K; 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 bh4si820695ejb.591.2022.01.12.17.58.56; Wed, 12 Jan 2022 17:58:56 -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=T3IrmJ6K; 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 09FE468B06E; Thu, 13 Jan 2022 03:52:46 +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 7C8AA68B046 for ; Thu, 13 Jan 2022 03:52:42 +0200 (EET) Received: by mail-qv1-f47.google.com with SMTP id kc16so5128730qvb.3 for ; Wed, 12 Jan 2022 17:52:42 -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=FdB0zKi6iJgE0MQpOYU2AbrrWGHoiEzt/LBbgsb5Qig=; b=T3IrmJ6KOaAJN5EpAdBwgUO7n9Rc+NZMift2rUM536TUWmUlzHI/cN3V2NVh7qOcX3 DQOfDRHlZByfnXA9vrsXdrQidzT/oT/oX4r8PpYBolC5f2eeAeWi6dJve8kG9DI01YKI svNNJaF33rz6kIuWZjTFqAHLZ1a499hpRdv0Ans95KovvyTmm326AgmwrcTDHPDoTHg4 gCg76Un+QZ7DOwfakuuJ7+9XnzS5nr9S83/svGF673/hrNGhQs6EJR2E+BJUZfBmB5JA 5quxW6mZIl9Nrv8tZrMPywS22QOBQj/5/QnqCX3M0xzDOeoeUAmazipCBCq/qP/iO1HO n8wg== 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=FdB0zKi6iJgE0MQpOYU2AbrrWGHoiEzt/LBbgsb5Qig=; b=25/PDW+gcExunejDCkcILJW0k/MvMJglfNPYOPC+A/YwHrugTrNpYL8wsDu/pkKbfg ECacVgMWlL6fX46rRIBrK4WDEMIaaVDdpw0eqPyQdalc5DCI6iR6vYudZQrNp9VXFMC0 le5tvyqyGyTIaOV65gpS5SG724eDNCtxBOCAqqcauLQ5ufCEfYV0+2S7+t1SGl9WT+Pk CJX8Sd5An4OK8utdBVQAV4wnEN98cxaWx1Xi00g+FN4RwXqBXExokZKG6PAttbTSWmm+ qCmHSbDfEG2oTx8edSFJI7LoppLXvKtaG3MHPCrdc8PdDQKm/xfWikcrf/jdH3ZpU1a5 ME1w== X-Gm-Message-State: AOAM533x22e4m8aQuVCgACa+PO+pMxLXKdH9ORvX1vNvvr3sY9mlVkpG jcklOOKfoptv9i/UnmPMpX+7PLinbrQ= X-Received: by 2002:a05:6214:caf:: with SMTP id s15mr280525qvs.115.1642038761053; Wed, 12 Jan 2022 17:52:41 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:56 -0300 Message-Id: <20220113015101.4-35-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 034/281] avr: 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: 56QznEL7EAei From: Anton Khirnov Signed-off-by: James Almer --- libavformat/avr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/avr.c b/libavformat/avr.c index 6fdcf68952..14a633ea5d 100644 --- a/libavformat/avr.c +++ b/libavformat/avr.c @@ -52,10 +52,11 @@ static int avr_read_header(AVFormatContext *s) avio_skip(s->pb, 8); // sample_name chan = avio_rb16(s->pb); + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; if (!chan) { - st->codecpar->channels = 1; + st->codecpar->ch_layout.nb_channels = 1; } else if (chan == 0xFFFFu) { - st->codecpar->channels = 2; + st->codecpar->ch_layout.nb_channels = 2; } else { avpriv_request_sample(s, "chan %d", chan); return AVERROR_PATCHWELCOME; @@ -81,7 +82,7 @@ static int avr_read_header(AVFormatContext *s) return AVERROR_PATCHWELCOME; } - st->codecpar->block_align = bps * st->codecpar->channels / 8; + st->codecpar->block_align = bps * st->codecpar->ch_layout.nb_channels / 8; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); return 0;