From patchwork Thu Jan 13 01:50:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33359 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp22474iog; Wed, 12 Jan 2022 18:08:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNtZEEVC+Hq6/gLhXym2K6SRQ8uX/2MJWMKqhWbTsLr6fYGt6mWn0Vyh2yVT7IzveRr02z X-Received: by 2002:a17:906:af82:: with SMTP id mj2mr1852416ejb.33.1642039692083; Wed, 12 Jan 2022 18:08:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039692; cv=none; d=google.com; s=arc-20160816; b=gOEpkZ7rq0rn5ua8Iv5RFdgKid0S9MMy+q0+UhGovqPxmvqIcygGA2i8/l+NRFpCXM Skb+vB2KwP35CZZZgpRRoumNXTpQFuwpzp2uFdFgySGKR08opgFqsFhHt21/3xYsEDMh 1Q5DYp0LLdtwGqaiNS1Inytr5eY2rxH3ktpGpbby44FSRaAgnhZd6S+aiNetPGCIUev3 bJldNTCvVOkI9rumCEa+8U7O3yfUIW/CU0ufCpTfSJsCyA8W3QLawDeldDOTOqtZ1COk Oqpzgchgex9s46oS7QAs/17BbnveIHxYmkwpBbtZNjGwEWXJESy7WIl8km+iKK0kQL4P sNdQ== 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=UuVuzlOC58MFYb6OjTMIQMIACXtm+2alCB7o100Bx1o=; b=tLS5e5U7/STnuAKzT0PG0KAJ0k6PfdQI6kXwepgR4DsVWwW5dikYMstGqkm8H6RKj8 Bwzy97XyBDtM4+fTAVK5HUNfFyk9dwcUJDvmt4IaGJFkYWN6JZkTRrIuhLnTdOCB/2Oy 68lBBb5Sz8ieJ9GOs7qYlmV9O4yjBkSBurfnXvl7biL1gA9cyd24YbL6jvIKmmz9ytco TsKtURykIq3Bg1Hmhkmj0Kp4YeAHLyRaRfEbAscfpjKINkrVjC8SYs1IH8S2BXXO5L6Y nyYY/uOqBovh/Y+QYVWY8MyTS7jyR/FpY3ntI53yoibJ6pwLTV9XIVeJlCYxEgsPxBc6 cixQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RYswmWoc; 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 bd28si832512edb.262.2022.01.12.18.08.11; Wed, 12 Jan 2022 18:08:12 -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=RYswmWoc; 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 0A65868B1C6; Thu, 13 Jan 2022 03:53:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EEDD68A255 for ; Thu, 13 Jan 2022 03:53:32 +0200 (EET) Received: by mail-qv1-f52.google.com with SMTP id q4so5083136qvh.9 for ; Wed, 12 Jan 2022 17:53:31 -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=V39lZA9zYKA1bOefsutOkcFHlqijqQKAXdIAgZS6dIQ=; b=RYswmWoc2HqCFal6H0xBG3Ye9VDqNaP7TD+jXf263TGjRGqIY82yZhFrJIgTzJuqG5 EOBJHXGx5EFTVnjYjM0AIy7WwwZUdo9v+z2tJDHKbea6y9hYbeLHIRGNG+S4O7l7vNoA gUh++UMiB2QoYnlRsRlILX4k4zyFjZ1YYecHO/ziRv4mm2RKPt2eMO9ziS5Goeb41g8k S+bPbNZQTzApYlBA1vx3DwV1kaK62n2obvlh/ZXehoVQ3j6oS7w9Zi44Xq0Z7mRCVcAo URi9iLjKScgszobOU/s4jmzNJyLAMGXHjfW4y8+uwfkFIMraROpHuwgy7K/wqIUsyou5 OciA== 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=V39lZA9zYKA1bOefsutOkcFHlqijqQKAXdIAgZS6dIQ=; b=0sYmIlwqoiq1JMzn2BOCa/Zy7rJBBH2iMyKPEut7hwniFCt5uixX1GwysgTyJ2Bw7C HGCA5yW+SLkDZv6/6nxjbJOeWex+LstccxK9UZxCaLFzl94BGUDxX9mW6c+rH/V5oG73 i++DC8omUfxrOPMIBmzdBcKAshUin7bHBfY1DI0gHWW+XFMZHUwpG7HHNyP5n0qfN1+3 BDx/os+xZca5o+xizewzOTSRFvncaJY6XkR2XUbajl1rwF7H7lL17llpaIg8x0u3AWHb Et4gb5BVoovwmPN26lgDTzDdKmX8u2wZrxxmY3G0ajog77tiy/CbAa/dn3eaUvavFWGg aZFg== X-Gm-Message-State: AOAM530DaEpfMwk9UeNANnjCbO2e0SF0baVbrJJMgvPnem8NZT6FjSv8 biV2aTaj+kUlndWZvI+ifyf0Diugz3U= X-Received: by 2002:a05:6214:4002:: with SMTP id kd2mr2291099qvb.35.1642038810724; Wed, 12 Jan 2022 17:53:30 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:30 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:37 -0300 Message-Id: <20220113015101.4-76-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 075/281] idcin: 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: Pbq+IxEJKWgm From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/idcin.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/idcin.c b/libavformat/idcin.c index b7402107da..c92ed2c237 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -218,9 +218,7 @@ static int idcin_read_header(AVFormatContext *s) idcin->audio_stream_index = st->index; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_tag = 1; - st->codecpar->channels = channels; - st->codecpar->channel_layout = channels > 1 ? AV_CH_LAYOUT_STEREO : - AV_CH_LAYOUT_MONO; + av_channel_layout_default(&st->codecpar->ch_layout, channels); st->codecpar->sample_rate = sample_rate; st->codecpar->bits_per_coded_sample = bytes_per_sample * 8; st->codecpar->bit_rate = sample_rate * bytes_per_sample * 8 * channels;