From patchwork Thu Jan 13 01:49:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33304 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp13696iog; Wed, 12 Jan 2022 17:54:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzUV9VOPYxll9xPc2mjOtb6Pw+sFZiyTqOg9FGX1cVcFOyypggf1cfMhTYrBeaxo5yhuyRe X-Received: by 2002:a17:906:3e8a:: with SMTP id a10mr1824119ejj.612.1642038892525; Wed, 12 Jan 2022 17:54:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038892; cv=none; d=google.com; s=arc-20160816; b=RQTYNJGIDx1xrtrpKTxJZbBPRRqTrvGSs8LEyBxQwSDWcDSVEkWEGZccIgvCIYwtd5 OMWEW5dyWSm31atBfBTeV3ZRl1+WNAn4F4pwOw0K9/HLbtALA6Ljnn/IG1Jk9Ya8hs1s sIrHhCJ7nXRqqskKd2yuGjfGAjiNKoGkxK26DvJwXXG6UU0lWxvci4NvXVWX5HXYpIn7 h3pacURurGjme5jARi3W5eoBvYDUB86CBJgUplZuwVqGpgfw1eKFxRYWf347pWfEQatp YYkkWVC9zHgCX42WLNWTnhaNeJZTbuwckLUXZJ+DLvSfWgZAi7NdHhvaPuDosNU6CHwP L9ow== 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=M1B86iQrxhLNWfjd99QJUPLfeEytlQZyk2oKRMJ0q0cX8eu6DhqjuKN749FJcubHxh zkbb564y6iBWfLZKy6eN8+w+8JSKLEWR1hK3ZJC7vM2KWDxxdh5QjE27vmTPTm4mIWQy uYVcMTz/6jrxjjm3JPtuqIEomgPRwEZJSUWr4YEKyhbypltC70hdHhvOB1UzkWcnawL+ gPAps7kU4BXmWezGm0zIx8RmYnr8LOTVdJwnPMLUV1HGYFnwfD39VLUZuI1SWbN7f7CI JCLVEY/ELcaRJA0H1gqxQLolYE7444RlPf6MYd6OtWk5wgADnBc1zLtpPWMYWi2Inaim ET7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=o32Ki6Ju; 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 cy12si802739edb.629.2022.01.12.17.54.52; Wed, 12 Jan 2022 17:54: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=o32Ki6Ju; 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 BCE7B68AF91; Thu, 13 Jan 2022 03:52:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6FD268AF7F for ; Thu, 13 Jan 2022 03:52:16 +0200 (EET) Received: by mail-qv1-f42.google.com with SMTP id l13so3579671qvz.10 for ; Wed, 12 Jan 2022 17:52:16 -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=o32Ki6JuMu9ZJmtPQYloHNHk2vFQlIZ6ITkhID/vVaRjfQybabEnrVfL4Q7mAnTPKr DBcMfpJ9QS2bYXvVzSshwCDp27WY6HuFzLCxlBDXL8mk9m+gvnSBtewoRrdz8CpofB4U LJ26MBxwRhT+Fh3A0hDHigdKCqNl5NsiPn/TWjfAcu9AC4JpbMfrvbODZzl3JSJJjIjn lgRev9ljKdf+Y9rFrO0eoTmXooqkPSVnbOS6r0ycU2eTE1c6q55e4JMei0EvbS/DmUR+ UkmUQEqO03d+fwNKf1LDG245bLYfJzDG3cB59zFzE7abJM+O8cK0Qu8UFV/KpcjWWpkW QtiQ== 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=lHDifhf4w2bNMsz/XY48e33vmMrE1YxhQGbixP2KIlnQNrnBZlBFqUWRejaCSIWNqX JrAYY2Ohli8v7y5+pmQk1zdw0CYL4DhItWrspxWTK9CNDr81VbABF3nW1jfbLbgMdkPI iCiwalnTBOPmrGDUUosjfMyEEuoamFyeQLokxXqaX0jrCTVYV0sBg5CtFitn3Hk6dLe+ RMgwDS6u+uSEgM9pVMAY7+MPP/iQ/vRSiRUqQIZjfRxdOhQAw2ovKeCd5xTr6QdBhDow b2op8aRI7zwZt7JbSi83WU+U+bKMFBkv+KTli7L57Dat3P0jg1RBFrlfjfpTWk6h4E1u nVvA== X-Gm-Message-State: AOAM533/wmmJxeCp79PS2aLog80jt8DCiLdq92lO8HYau7foTgZQ/678 a/PClXan7TOfZ5Eh0I95EZJJFr1fBfc= X-Received: by 2002:a05:6214:2684:: with SMTP id gm4mr2165439qvb.131.1642038735319; Wed, 12 Jan 2022 17:52:15 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:14 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:36 -0300 Message-Id: <20220113015101.4-15-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 014/281] 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: wMaLXWjVqJyd 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);