From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6465342CA6 for ; Thu, 13 Jan 2022 01:59:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BDCB68AFD8; Thu, 13 Jan 2022 03:52:50 +0200 (EET) Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 839C568B075 for ; Thu, 13 Jan 2022 03:52:47 +0200 (EET) Received: by mail-qv1-f45.google.com with SMTP id kl12so5082533qvb.5 for ; Wed, 12 Jan 2022 17:52:47 -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=H49qTPlO+h4zrCJ3YCK14RMC5b08E+/qBZr81RCEF2g=; b=nehuCGO9kg9/7noURroQ7bvJamg5ZsIj2QsMd1opE/ajrgCxXKW2c5+A89d/M8pZUO r+J549hXN2cD9NIAaOnDg3f+4O8bAeo2oTiK047i/FpBiO0UTiKmg4Gvdt6IyXStDrQL Mwlny7DpR1HVcUcKN7NyeG3erq1BzyNsK1EabYm3fK6Y1qmH5rWehNAz3b67QInjDFEF /b9E0QJTkNAHh3+rtrGwT7kT35CzlIj1sDAD9b4DvcWWNxbWcQJUDXKzYLglwft6hAbm /PN6g9BNYmoUwKkouqtjMD9S1hd58CQRoLitCF8q0B8LrUlAHx5MGwWZ7rO4/GjBy7ev 2gxQ== 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=H49qTPlO+h4zrCJ3YCK14RMC5b08E+/qBZr81RCEF2g=; b=6ZJAMoJsjc1w84wv5TYAablpgClA1wF+p3AEyx5485CQs3cpz8AzmBKIbopbJkPQFh mckHBlRgkDhE8e9WSPo1X8JikAkrjD7P7g94EbV41YxU+vzpt4QX+v2NWOQOgChmYpyG c942cgp0cOnNFN9MUM5s55oHlIR48mk3BFyqKXHW+nsWYNbwR4z7VnEdKYFAH6WexHll 77/P0DS3D/NHckaYfF8OT/Q7xO6VsqzaA0WSNNIk1Jhe6ZwrWAJBXwFNhOWIpKzbzZiV UC6E4riohs7+tu+m0+nhsd1LYcZ1+MNyNCP5l073M8g3VsBocwnkmGJ2lBeEspMX3SUl b/1w== X-Gm-Message-State: AOAM531+Ob7dJN2QYah6Wy/61EmFG1pBUWgObQSsnG/tRPA416A+dr/Q Wa1/HhHf4yyodBHF764vP3IRQT3CZfk= X-Google-Smtp-Source: ABdhPJwfz5UXlkhEfG6sHHk3IhZmfQq6xg7fWgBOKnJyZOeoGP5nmQ2Cj4cUHbDGkyvE/VnsluMpGg== X-Received: by 2002:a05:6214:2341:: with SMTP id hu1mr2331607qvb.78.1642038765842; Wed, 12 Jan 2022 17:52:45 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:45 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:00 -0300 Message-Id: <20220113015101.4-39-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 038/281] bit: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Anton Khirnov Signed-off-by: James Almer --- libavformat/bit.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/bit.c b/libavformat/bit.c index 380cbd37cd..c8d02c6bb8 100644 --- a/libavformat/bit.c +++ b/libavformat/bit.c @@ -63,7 +63,8 @@ static int read_header(AVFormatContext *s) st->codecpar->codec_id=AV_CODEC_ID_G729; st->codecpar->sample_rate=8000; st->codecpar->block_align = 16; - st->codecpar->channels=1; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 1; avpriv_set_pts_info(st, 64, 1, 100); return 0; @@ -124,14 +125,14 @@ static int write_header(AVFormatContext *s) { AVCodecParameters *par = s->streams[0]->codecpar; - if ((par->codec_id != AV_CODEC_ID_G729) || par->channels != 1) { + if ((par->codec_id != AV_CODEC_ID_G729) || par->ch_layout.nb_channels != 1) { av_log(s, AV_LOG_ERROR, "only codec g729 with 1 channel is supported by this format\n"); return AVERROR(EINVAL); } par->bits_per_coded_sample = 16; - par->block_align = (par->bits_per_coded_sample * par->channels) >> 3; + par->block_align = (par->bits_per_coded_sample * par->ch_layout.nb_channels) >> 3; return 0; } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".