From patchwork Thu Jan 13 01:50:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33342 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp19620iog; Wed, 12 Jan 2022 18:04:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+KkP340OlSD90qTUkxqhbrDHD7m3MB0z5jQJhScuf/HHrm+TtEdASYEJ+jVpZtum3CDK3 X-Received: by 2002:a05:6402:5190:: with SMTP id q16mr2239584edd.157.1642039457665; Wed, 12 Jan 2022 18:04:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039457; cv=none; d=google.com; s=arc-20160816; b=JUw5HjnKtDgY/BIyNgXRuxSWwWYlZ9tElyr43wvj6r8GqJY4VGTSPk0ClwS5DaDwsZ cc8s5juaT9JEmDPfrwy8UBBVfHRmilSa0U6aHBvULCiMGfJSB/U3wR8DwD3NrNVADnq0 qtuHUrk0L4ec5EO0DF3WbqAcITAATdJFAtpxwc9RY/U4pp3Pvd8yTxXWE2hmSAcfwNQz jBxs8mMJj7RDaLuf8B7tl79/Z29KU+V3JBASFsLfGOqVGSSbdOIkavF1EDxotthZemKU qShCaUx7XcdpKy4X/5+joqJl8D8CLeo8CX1EM1adjvHXKYcgSnf2YQA5Un3lcMvBsS3/ y/HA== 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=VdfrB39WmB2jg+V5RpSeFq5BWiICduOQGP1c1qz7P/s=; b=YVuYCJ5IOWxjsuGusVUSWVUo1qBPzIiP2JhQ8pVrtsNLTDGwg6aQXagiXLR288l0yy bZWxsYqKHAOF2dWzE+XvO07SofJg94rA2+yVX3CkX5U7yuSXDJMPR4N6LgCv1IlvUL+/ 189DGNoikx6wqaBNm4e+Rrs/wMocCsN3Ja9z/ccxN0oWDuuMXNFXEbWx2kGJd7iNub6A GdqMutuGscY5p9RoBSBhfm9lAYpflSPCFHSqZzzQXtD2otkIxpfQ/J8mLmAHjg6MWxgY x02u26yIS/TI3WW86/Vb5XQPBKKrMtQMdTYEMAWKjgs/qG1YW6CXp3sqKs9jNaszyr+o Y1oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hmiPkH+k; 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 hd36si829088ejc.80.2022.01.12.18.04.17; Wed, 12 Jan 2022 18:04:17 -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=hmiPkH+k; 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 5313A68AECA; Thu, 13 Jan 2022 03:53:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E7D468B046 for ; Thu, 13 Jan 2022 03:53:09 +0200 (EET) Received: by mail-qv1-f54.google.com with SMTP id q3so5108950qvc.7 for ; Wed, 12 Jan 2022 17:53:09 -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=qVYpN3lBQwxLDp9GvRBGKGv82EDazGzaGizGAbeF9C0=; b=hmiPkH+kmfF6O3fDDsuLN291G5K+qIfL6iLhSIxbflhuj23dm28gKg8dBgT56c73pk Cj+rRSWOL3Q0mj9/azxV1yrSYI6xvMloQXb5T8ErX5xBAzyMCrpB58TPi+qqri3tOadF LdPdGy0Jw+PizKyg7k1PTsAWoR48zg0NmYItafGBDD2rutdf39c4fC3RHZfsrjmwynSu xylMlrBamfdedqVjTFScp8QAq8zJEoDTdmhzSPm62ULLW+vprCh3MPjr9ydWpWM5DAlX 3IokV0ax9JBAsTN2cNL5wvDcBDR7nOgTWbCQefGFKAD/vlIySWoWQ0zhb5GhkY9Mc+DK 8aeg== 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=qVYpN3lBQwxLDp9GvRBGKGv82EDazGzaGizGAbeF9C0=; b=2qv3uTT45HlBA8csV2u575d9mwe614nACLuUAVOKjvBQtHHWbo7WqvZ7eRVHAPDjtl FrVehu//ivjOlImvGyGb5Qsd+OnHCv0kNObPq/s0684qNo1wxkXdZg7f9EZG7r6hOxHa GBxb7hCbeo8jJt5sHSFMquZRAE5ivIXzcCK2763gyOxik9dvHUAe7xS9SKIzwVQ+RnE9 mtQes8auNRql1HD9GoCskU9wMCRroORxUWaCVbEDFzaT6FQg0SA8Kp+PhYIC5KyRyX2i FeonP4CRIMg12SGrEOiISXqsewqeVfCsIlfFdHuXICTkn2RMsUlh5IxzKYFRxOXsCfq+ QdWA== X-Gm-Message-State: AOAM531b51A5CHmRGANXKa4+Us7By62C9ILOXAbwJHuvDSsuh24/mdi+ Jaqpi2v181UQMjvDERzJKTjhLqsJsqM= X-Received: by 2002:ad4:574f:: with SMTP id q15mr2335157qvx.94.1642038788675; Wed, 12 Jan 2022 17:53:08 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:08 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:19 -0300 Message-Id: <20220113015101.4-58-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 057/281] epafdec: 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: 6UBXCyh5IcDt From: Anton Khirnov Signed-off-by: James Almer --- libavformat/epafdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/epafdec.c b/libavformat/epafdec.c index 8b94278c01..1e5f1f887d 100644 --- a/libavformat/epafdec.c +++ b/libavformat/epafdec.c @@ -68,7 +68,8 @@ static int epaf_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->channels = channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = channels; st->codecpar->sample_rate = sample_rate; switch (codec) { case 0: @@ -84,7 +85,8 @@ static int epaf_read_header(AVFormatContext *s) } st->codecpar->bits_per_coded_sample = av_get_bits_per_sample(st->codecpar->codec_id); - st->codecpar->block_align = st->codecpar->bits_per_coded_sample * st->codecpar->channels / 8; + st->codecpar->block_align = st->codecpar->bits_per_coded_sample * + st->codecpar->ch_layout.nb_channels / 8; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);