From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B492B42E4B for ; Thu, 13 Jan 2022 02:27:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EDF8668B4C5; Thu, 13 Jan 2022 04:01:22 +0200 (EET) Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D053368B4A5 for ; Thu, 13 Jan 2022 04:01:19 +0200 (EET) Received: by mail-qk1-f175.google.com with SMTP id c190so3923272qkg.9 for ; Wed, 12 Jan 2022 18:01:19 -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=3zUmtcXCiY1YTnIqVg+r2nUefsBqtc1UXi7CebsQNh8=; b=KrkFUVBEghXw9FoeulOsww+Ve4IFN9Rf9i3zPMWiArP0IWA0fTLHiZ2VwP9H52hlN8 rdkTjhOIzbly3lZDmffzS+fRV83wyx/eiBKHMGQgEkqXH5DPdQnoKAoNN2Uk9X9e0Kev EHxmP5G/8nCmwpinV/ojjLxCZ2GT7KnbzZgjYOxDXrzHgPkqbOfPDw13SBRjLYNi44UC Xw0hEsWx7GfHkZVVgc2wEy1rc6gREK4nljQDH9WHfKp82AIX1yGsCbhCesjhRES93XVj gmh7OIQD9hOxplU5GeiVgbCiXj+PEtrmMCWNTkvMrzKBeVmpzS9EUbHAj7p9m4RV+zBL mx3A== 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=3zUmtcXCiY1YTnIqVg+r2nUefsBqtc1UXi7CebsQNh8=; b=F8armIDlQPyPVwFvErBx8Y/sauUuU7NmOp/1qaLkKb8HeLi98EQrlUIVUnyY4E83Cq 1nIq4L+a+C9o9h5jPejpqnCBBlR0b8vjNDUfS161c4cbIxqofOghQhxXoXVABwq9Rl2w icWbd7/3MIpZq07EsfZxaXyFGp6iEfkK2bS9s28JAIXM/gZMuP1dDrEN7lx/xXJrRVt6 pRnNh8ZKJYVl+Id4BOihd8d1Rs+aBh36wH/VuB0sOXDomRXsH/IRJZg8Nrn0LVt71Pwp iAhbjCw1AMhEQJaj2bFKrGT8JaZs11NLcKBaMKfP+5no4HcDkkFWagWYTxGBYf/JnffK gDJg== X-Gm-Message-State: AOAM5322QEZn/RW3G5+Ft3U5okJ2HQcCS+/YeX1EljNgGWwNbBoMZqee BIoOekvjEkDuVK1lDY8+cWx12i1zHCk= X-Google-Smtp-Source: ABdhPJwFMbEZ/EXKu8qJrGJZWhjAOK//6a8pDP4MCcIgiGoNSbsuAVT1w2Buq1YcU02l6k+HaubTdA== X-Received: by 2002:a05:620a:2407:: with SMTP id d7mr1883560qkn.114.1642039278345; Wed, 12 Jan 2022 18:01:18 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:18 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:08 -0300 Message-Id: <20220113020026.590-13-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 161/281] vag: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Anton Khirnov Signed-off-by: James Almer --- libavformat/vag.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/vag.c b/libavformat/vag.c index 9ef5466e39..624ae9df35 100644 --- a/libavformat/vag.c +++ b/libavformat/vag.c @@ -42,9 +42,10 @@ static int vag_read_header(AVFormatContext *s) avio_skip(s->pb, 4); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codecpar->channels = 1 + (avio_rb32(s->pb) == 0x00000004); + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 1 + (avio_rb32(s->pb) == 0x00000004); avio_skip(s->pb, 4); - if (st->codecpar->channels > 1) { + if (st->codecpar->ch_layout.nb_channels > 1) { st->duration = avio_rb32(s->pb); } else { st->duration = avio_rb32(s->pb) / 16 * 28; @@ -54,12 +55,12 @@ static int vag_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; avio_seek(s->pb, 0x1000, SEEK_SET); if (avio_rl32(s->pb) == MKTAG('V','A','G','p')) { - st->codecpar->block_align = 0x1000 * st->codecpar->channels; + st->codecpar->block_align = 0x1000 * st->codecpar->ch_layout.nb_channels; avio_seek(s->pb, 0, SEEK_SET); st->duration = st->duration / 16 * 28; } else { - st->codecpar->block_align = 16 * st->codecpar->channels; - avio_seek(s->pb, st->codecpar->channels > 1 ? 0x80 : 0x30, SEEK_SET); + st->codecpar->block_align = 16 * st->codecpar->ch_layout.nb_channels; + avio_seek(s->pb, st->codecpar->ch_layout.nb_channels > 1 ? 0x80 : 0x30, SEEK_SET); } avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".