From patchwork Wed Dec 8 01:06:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32143 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7045366iog; Tue, 7 Dec 2021 17:10:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQ4h6ofkmBY0v6fc6i9+Ru2/MjVebQEBxcBnM1K73ByM56mFF4ptsLP9BVH+3xEA3Di8s0 X-Received: by 2002:a50:e611:: with SMTP id y17mr14687422edm.270.1638925811316; Tue, 07 Dec 2021 17:10:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925811; cv=none; d=google.com; s=arc-20160816; b=seOOjPwzcPzPpxrIWVrCAb5brTtbH7TwrfCTOch3yPHfzpOEP7xpvWn8OuppxSWm+u y/NldUl8FEh5m3VYtYuO30wcXIfsNvk7nCQadgJkMhCO1rQ/R+A5N9rGb8la1BQs48H+ NjyqdjZZqf1NERLKXv4faDapsrlVQLWw1RKTiTf5d3lrE5TWo/jYqoVjINy1Ra2SlN7G bnzgPCrWJKHw6IbgIdqX0rHjxa+SVH6JrTsh1D4FNmbU8pMulUuicVfuSh3FXWsJ6czj Y4R5ILoVXhsyYBGOv9iP2LRfn0yY0Qiu0qyw6JjPC8b/B3aZKR2/sRvf9O7gBnRj9nps VJuQ== 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=xreVnxjYwaIB3iDNMB7lvfIlyCI1JJimAbDA8WeV0s4=; b=rsDP4UnM2AcVndrwyh4jj0UfHPiB7QBp2adLrC/QTq0xD1fgz72x69gpaUXX4wD0RK xyUQgrJ/DwU4UNkpKJfDK5R6+CZBtZlfvUVtfph6wrVUHLDLzZJOtkV4JTS08A7WiQXy 98VdjpdmsXVuGDH14rWtbBO5+DpwxWta+PvE5j1D8yDrQCz6sqiDNFToofCSfl6JgPhz zrbQBcxbTOnMA6He2aBAXb9xsFyTI8uZj5zQ7OTeFVOS08ofZ3k8UMLmwshj7N7Q95jb QgmZ6+Jo4poM80jQKYP6rB93j3tvpRYxLV/RMj4Vn/MH63juXCqUGF9BpPcz/55Bef2s l20w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KlpVDFbr; 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 ne24si2633658ejc.492.2021.12.07.17.10.11; Tue, 07 Dec 2021 17:10:11 -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=KlpVDFbr; 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 5F06868AEB1; Wed, 8 Dec 2021 03:07:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f46.google.com (mail-ua1-f46.google.com [209.85.222.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2054F68AEC5 for ; Wed, 8 Dec 2021 03:07:46 +0200 (EET) Received: by mail-ua1-f46.google.com with SMTP id p2so1847319uad.11 for ; Tue, 07 Dec 2021 17:07:46 -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=kSSC8FluUjNunPAt3fQv0sPy65m6paXqhNgDYLS6xVE=; b=KlpVDFbrppmRcujOB3+S+SOgd5Q8fqGv25OFq7YsmXaEBgbKI5KAPyB0VMUFJ84aSq xIEG08KlYxSniBSyDXY5WBF8vBdPO7VmUYD8Fe3kMnqpL/tGdsfGMK3iZXkTL7aLbQBv tig6oYcZPivR/e2f9TcsVwG+JdT2r/zRx3xhY5g9t+mV++X1E9zPej69xla38mPfsArY U1scGL2WwZxvdHusCdVl5l4aIM3s2enfEzvM9TNAvuHol/t0n0UOinyYz4ZMy09YFSBG 4CD12D0hhP+WIu6LTmDTxKxtBJGgie0PBW9eBqolgNhJniBbYDX3PyXpNBFzfkwboqhH Kcig== 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=kSSC8FluUjNunPAt3fQv0sPy65m6paXqhNgDYLS6xVE=; b=DeelnzCjFK9qRVwWb2cue2SvQ4Sq1yQ5p3FQYBhKuYA7L7A4/VaW11aOldGBFp5Hju LcH97PmS3ftXI8OVV9KxugxZXqPtiEJg//UvBIqT/849cAc8lv/hNSm46TYu8iF58FUx JunOYaQt8R4ebdsbh/lssupgX/jhyhDyW0sKAQ3Mw1fSiBi9hxXv7SEyselzcOyW8BVf 1k81PYYn5mbAnfqHX16xG05pGzT4/dV/EuIBP0gDrrr0ZjSZz131XzBpqVKl9Q6Qghug kQPRCl+nJkrjhNMD1qr7+0ZyMvg4ZCsB97H9NuTs2q5BwJJ/dMCQ1XOIdko3/Hmj+oj+ e4Mg== X-Gm-Message-State: AOAM532fcTTa3KoU0lOLsSK7Dnp1VEA+g89ajXEAnnpX1KusOKhnrNa/ RDdEsDYSWqJtrJDPFvsLED3ZWI0gnUAVZJLQ X-Received: by 2002:a05:6102:199:: with SMTP id r25mr50566452vsq.53.1638925665386; Tue, 07 Dec 2021 17:07:45 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:07:45 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:30 -0300 Message-Id: <20211208010649.381-15-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 014/279] acm: 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: NTFnHIGxTIhP From: Anton Khirnov Signed-off-by: James Almer --- libavformat/acm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/acm.c b/libavformat/acm.c index 0ee9114f70..a6da000130 100644 --- a/libavformat/acm.c +++ b/libavformat/acm.c @@ -48,12 +48,13 @@ static int acm_read_header(AVFormatContext *s) if (ret < 0) return ret; - st->codecpar->channels = AV_RL16(st->codecpar->extradata + 8); + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = AV_RL16(st->codecpar->extradata + 8); st->codecpar->sample_rate = AV_RL16(st->codecpar->extradata + 10); - if (st->codecpar->channels <= 0 || st->codecpar->sample_rate <= 0) + if (st->codecpar->ch_layout.nb_channels <= 0 || st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; st->start_time = 0; - st->duration = AV_RL32(st->codecpar->extradata + 4) / st->codecpar->channels; + st->duration = AV_RL32(st->codecpar->extradata + 4) / st->codecpar->ch_layout.nb_channels; ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);