From patchwork Thu Jan 13 02:00:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33453 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp36562iog; Wed, 12 Jan 2022 18:32:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+qxDSpTmZ859cvQNJWJfAXK+FMcPNqaLuJF9D2KVzU9F+x9K4BsltzFAZna+AMtXvtfi0 X-Received: by 2002:a17:907:62a1:: with SMTP id nd33mr1900583ejc.578.1642041120142; Wed, 12 Jan 2022 18:32:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041120; cv=none; d=google.com; s=arc-20160816; b=U756xY7ZcL9uBrMA3BPWmXX2vSHn23nyO4fqMh7+sdIve4ZNTTkFi7sx6ADdROfUhD upRroNSnov6Ushx6r9ju1dbRDGEwM5Eu4l6Keowx4ERBzGDWU0kJ4gzqlb+Xx3J965Zn +U1FtOvwAloNc1+jIzZmk3XOyklUIumEWBQuuQ4Yyc3Mhph7+aDY0PqpnQAf9Xg3twqM 0qQVReIWFXE4gSfdYmjI31aj7rBLDXdlpsJdzLWiLaPkENYMDPtAxtTGcd8S5LFjlKhx 0LfeQIi+gHAq7zCw0Lv6dTeZytalB4p5bk9WmBxc7axQfPNw+jcvPYc84szteEgf4pkE DV1w== 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=1tS433QeNaTQa8jPHBxq+XU8GRIVTHHW857V1ptkVis=; b=b9HQ4XZa2TAVREe0BSNEczrKcG5E4me2kLNrPZMp43YAgDeCLiRD+T3dD9JSBlkRAY 2m9nbSBpSdPWljpij3iH9KZQSYccNmLhSvvDTShRjggU1HPGBVCJsGd9MSH2r7zThpyJ 2NB73XoNZu5AqCIPEeQZZnM/krBHu3RAlnIrZjfN3eJ1LQk6w9RcvI1wFQmi3XkpP0wR MpZbh4sR7Oa71rxT0te9QEjeyif5//uLWI1SFsJGUk16qNiykP0N8d29m6MOZ9W7qEF5 JXcEF5Jr29Ta+DP9cQA6sb7PA1Jp8tQ6etTnjCG1v/jeu0xD1Xx0TGWbKkQuGo7b96oU zjuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="WWlia/xc"; 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 ji3si864307ejc.138.2022.01.12.18.31.59; Wed, 12 Jan 2022 18:32:00 -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="WWlia/xc"; 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 F15D568B575; Thu, 13 Jan 2022 04:01:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2689B68B57C for ; Thu, 13 Jan 2022 04:01:43 +0200 (EET) Received: by mail-qv1-f51.google.com with SMTP id r6so5052756qvr.13 for ; Wed, 12 Jan 2022 18:01:43 -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=Mowc+tY3VrSgO+kIHI4C1JmG8lGgTdZYYIK+TAmXswo=; b=WWlia/xcQik+KqCBOmkiq/V9zHiVSrZx0PuVGvytOURPg275YAkuWgn0YwFSOxKOYg xZmJ3QaLY+XPFKz70/4+JRD/fT9tkSL1c+2U70ETYxIcKNSazwPtmCCOSm5sQ4ec8MOx MBcY0P7Yvx3Rbtz1vjCgPZV+w6VGwrvXZEW17DA4kV7VLq+5uLtI+VN48w08xa6dmLyI utvr33FJJ91vqpPgIQailqehXnFJV5XWFMmbi+2HPtRRKKlYmEb0OQ/HkhHzN8qth3pe oJJXqbo4c9Ef74BN3dCI8KD+LSzFNKSAo8iRSULCxJZrNRsVa79QSA5D3B9rSRILufYX c8CQ== 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=Mowc+tY3VrSgO+kIHI4C1JmG8lGgTdZYYIK+TAmXswo=; b=sYD7MNqrfdCiyfTHzmzCxRri5wP+8AAF/jq9iopO0yJ1cCD8I2EUI33SPLzJ1NMkNI 5JsamVB12OX5R1C/wrMGUf9yWBDcoT9M9/5YN33MjhfjJ5ZrvkdQivR/hrcUFxD1IPOc LackgzwsWjl4r1nxjClKRV2aw+bA6/44np+0fps1yLUoK4zEK1n1Q07beQodMO37/e/g 5hMOZDirg1z3cyqiPb9gldoOFqW4mYtymRTyZTdhjYT+9kk/HfIc3tEq5hXZuVDT1p0y bCwm5+DE7jTSa4npuezt0NJcRm0+Vy1XVH4rRjidDwQzfgGHNpxLAB5YO/dK+rlKk3RB xV2A== X-Gm-Message-State: AOAM5336TtqIHWPncrRu1JetRjuEOV8ScoRUD7Df/aDPsQcJ8wxUZKw2 kA9fuliisTpQDwB5O+uIjV4EGN8+qDk= X-Received: by 2002:a05:6214:2a82:: with SMTP id jr2mr2298800qvb.79.1642039301850; Wed, 12 Jan 2022 18:01:41 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:25 -0300 Message-Id: <20220113020026.590-30-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 178/281] xvag: 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: WNZZ2cqUXIfL From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/xvag.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/xvag.c b/libavformat/xvag.c index 994b710f8d..61f33ddaf8 100644 --- a/libavformat/xvag.c +++ b/libavformat/xvag.c @@ -45,6 +45,7 @@ static int xvag_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; offset = avio_rl32(s->pb); big_endian = offset > av_bswap32(offset); @@ -52,7 +53,7 @@ static int xvag_read_header(AVFormatContext *s) offset = av_bswap32(offset); avio_skip(s->pb, 28); codec = avio_rb32(s->pb); - st->codecpar->channels = avio_rb32(s->pb); + st->codecpar->ch_layout.nb_channels = avio_rb32(s->pb); avio_skip(s->pb, 4); st->duration = avio_rb32(s->pb); avio_skip(s->pb, 8); @@ -60,7 +61,7 @@ static int xvag_read_header(AVFormatContext *s) } else { avio_skip(s->pb, 28); codec = avio_rl32(s->pb); - st->codecpar->channels = avio_rl32(s->pb); + st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb); avio_skip(s->pb, 4); st->duration = avio_rl32(s->pb); avio_skip(s->pb, 8); @@ -69,13 +70,14 @@ static int xvag_read_header(AVFormatContext *s) if (st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; - if (st->codecpar->channels <= 0 || st->codecpar->channels > FF_SANE_NB_CHANNELS) + if (st->codecpar->ch_layout.nb_channels <= 0 || + st->codecpar->ch_layout.nb_channels > FF_SANE_NB_CHANNELS) return AVERROR_INVALIDDATA; switch (codec) { case 0x1c: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codecpar->block_align = 16 * st->codecpar->channels; + st->codecpar->block_align = 16 * st->codecpar->ch_layout.nb_channels; break; default: avpriv_request_sample(s, "codec %X", codec);