From patchwork Thu Jan 13 01:50:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33556 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:122d:0:0:0:0 with SMTP id p13csp990051qvv; Wed, 12 Jan 2022 17:59:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXvUQVPIsn5d+VTmoAnudZG4OVNdNOQImhqCEk4WRcu8phoP8R2KAc8aMQeNBZMgE/XQL9 X-Received: by 2002:a17:906:fb99:: with SMTP id lr25mr1818934ejb.165.1642039193003; Wed, 12 Jan 2022 17:59:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039192; cv=none; d=google.com; s=arc-20160816; b=yE3Jl291fbGtZcO7fZVeKVI6Mg7PoBHIMsjx1gg3Bs/hZOqxQVKQYLUljnjQdF+RTz fVOPWpPIznOONZSyl7GQgdYyHz70Lz6hgebggcJGRGKbemCzQDG4ItiGLvrGvN0SY4j9 yPZk/c8DPj0wpu/U8/w66zsrKNQQrSk78RqwYfIOsee4afpZuuZoVQ4DFo6m/1S+MWr2 XozdXFRUseuruJLY+5mzAA1hCSkTdokl0kvMbAEyqww4i2eTP6FYJQZWxk0P3Mm/ypbT y7itox7CNRzj4c78cD0QMLKY0TiVezBWx5qII4sbcBE5ZsNDJEavmnfaA+Bbn3+Sp3Ke lMZw== 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=+9B3abreeE1xAyb3/aygntp6BTzyxZFyvm9VP6epCjU=; b=yehv4QZfxFMwnmIeT+foZiQv7zaK9EVcz/78B6Cc7CGqg1OZOwEXZUcCmBhxBWmxul dP7/w/Y/Yjzpp16l/m4pw+a2aM9YJuOa+oJUYl2x6QcDh/V6e0AYJUYuJTyOWJGdO1MZ S7yxxDTaBGDn0pTIcQnFUmXe0ZrijfRHn4bkDBcgnCXzmXgiU66wGFxYPbl73Sx/xOHr JkYzjAVXqFvET63yQYKltHidqYUAHWulVB2DrQKZWkziF53qsBMXYW5ExyDtSYoa/NFZ SSZao/RIk7j9sIBsSgW5cgEM8FCH49Cz/GpN92pjEWJXNXWruyItv0g20S0/yW2dOkE3 xUeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nehuCGO9; 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 l3si797820ejd.860.2022.01.12.17.59.48; Wed, 12 Jan 2022 17:59:52 -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=nehuCGO9; 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 DCCDD68B087; Thu, 13 Jan 2022 03:52:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wkKCW2NL6EHG Content-Length: 1606 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; }