From patchwork Thu Jan 13 02:00:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33435 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp33862iog; Wed, 12 Jan 2022 18:27:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSebE3i1Ul7Eymnn3RUAszMzkYHpwArLI6lFWRWPmZTMYNlFBR1LgfcSt6jgYZfX6t8X7t X-Received: by 2002:a17:906:7c07:: with SMTP id t7mr2017365ejo.395.1642040824138; Wed, 12 Jan 2022 18:27:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040824; cv=none; d=google.com; s=arc-20160816; b=fr8OH3CyEouEhTDqdX1KDDpOdaaFbmo9KoB4blm7aQAdjOW7CF35+3lfDLBlp2TxZP Pu8xITA2Soaqzmj7EVjKmy3Nar0Avxm2FLcZv9Moc1VjKzwh4GBzBaNCU2Yt+XcFRxzf K5/b4kmLUNLhMebr4b03PTGl3zo/MSYOcnrW5afoAjkQ3PwPUoh4KrAXejyH+S1Ts31E zj21WKOMue+G0ULH5wH1Z6HB995Avi49c9Tp0THDI9EGutexYKBLTO2S+3HoHx7gTEoc BrQS7bawPv9NRI3HO+jlML7OR1QVSt6r3DKhJ3YAtXvfgFCAJvnzSndwUrE+s1CL4rw5 5Sxg== 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=09SV5qaLgDLmYT+g8cQJ8LbLD+Xj2eoVYFUvB57agI4=; b=rS2wgWrdMSKIxOLMJiBXSsBM/shpSg6AgMqZ2mI7NeOdRBYyke34QtAIcWRCMRl7X/ 4SP2KrsTGq7ZKgJA/Fy6DcVHpU+bXJHbgCgCUOulLx4g5t3DYRpSyTM1WdpJz8VggKLd ML2SU2S5gnVXxHJ9HFSmn+p79eMrWvO2SBu7+EeJVJB1w3XIrDNxhb7Qp0w3DdbhpCVe ErGD3fZChOdyDT1WQUFtVMwf5cHHBlOwRYfEmlGzolYIr0txTAcaIwXqwsW2B1odK0/g kDjyhEViNp56ThJsHS5+ndjooU9ndW65Y6W/lVmK7sonSmrEI28hzEvVFNFoAu1YCvtX b6XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=npXVjq2t; 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 o10si801935edw.363.2022.01.12.18.27.03; Wed, 12 Jan 2022 18:27:04 -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=npXVjq2t; 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 98A4968B49E; Thu, 13 Jan 2022 04:01:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA0CE68B480 for ; Thu, 13 Jan 2022 04:01:14 +0200 (EET) Received: by mail-qk1-f171.google.com with SMTP id z10so1221097qkf.7 for ; Wed, 12 Jan 2022 18:01:14 -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=e3UCIFjgrC0vV75ZedqxBdGvVLrGl999joSmg8WZHVw=; b=npXVjq2txK9KWOor2o3rDKRdzWrZzlpOyVMqLEZk15c+LS1aaaVTF4PkYKELJNABzY NcA22Ny9IpLJXSYuBO/RWL+tEa8OgqlJvCABdSQgoqV++lpuszPWowiTMu6tD3/VtXXK QBi7ZOEaqrcr0YHJu4IhhlOrVbb3ZBBgXzdNa1hKkgiYQzuRyPBxEr/7eUatQ6Bdpc/t xO3NgFQSNUi1cgxeftpNK/iqn4Y6Ma3xq2m9h9lQ8zs7A1XabvSUqESW+J68oxF0uSg2 Nuh+XIJM42jpVA2PCbD3eZKiRppQ0e9uFMzZnttZ5iqJspH0tMfK65laCo6+xt+lFtG2 kDSg== 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=e3UCIFjgrC0vV75ZedqxBdGvVLrGl999joSmg8WZHVw=; b=dtiSG5ti8Y2u6e1IJqQM9Z1nhWJgJAkliAAQpnp1OILFkMqJjFGN3YpuMSs654D4l8 kc7tgM3wC7Z4Zdq/LZnZbIPT5MH3LMUcLvKuRzr7L0jqmL43wkUT2Z7+Vv8PWSsGUtGC Pevu8eZfQ9ekf2VAfCoW6Adw2s945dc95ta3a2x07DS8mej+vLcWM5lLIhrGeZizIAgd oupG71/6QDE9ce/v3poRi/KJEQgS8HqP4o2isC8fG4tUupj7aAqWV5zM9AjTg5TqmuDU 7SlTuzynKNNws+854ikPjuE0p6L8yE64IchTdQAj1wv55vHwfpgCBglmLpJWbA24QygB ysQQ== X-Gm-Message-State: AOAM532XxhidmRaAyvvzJdB2FYirvtPlYS2hgONSk0NoIFHn2Gp3LWJE K7GJ4BEz7myBh5NWL2gSnbhi1dpSWAE= X-Received: by 2002:a37:a302:: with SMTP id m2mr1673090qke.722.1642039273531; Wed, 12 Jan 2022 18:01:13 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:13 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:04 -0300 Message-Id: <20220113020026.590-9-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 157/281] tiertexseq: 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: 3lbKboJt7ssK From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/tiertexseq.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c index ecc15e4039..d06853d0d6 100644 --- a/libavformat/tiertexseq.c +++ b/libavformat/tiertexseq.c @@ -242,12 +242,11 @@ static int seq_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_PCM_S16BE; st->codecpar->codec_tag = 0; /* no tag */ - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->sample_rate = SEQ_SAMPLE_RATE; st->codecpar->bits_per_coded_sample = 16; - st->codecpar->bit_rate = st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample * st->codecpar->channels; - st->codecpar->block_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample / 8; + st->codecpar->bit_rate = st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample * st->codecpar->ch_layout.nb_channels; + st->codecpar->block_align = st->codecpar->ch_layout.nb_channels * st->codecpar->bits_per_coded_sample / 8; return 0; }