From patchwork Thu Jan 13 01:59:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33429 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp33217iog; Wed, 12 Jan 2022 18:25:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzmChsG7FOcKvnNL+kaLDhw7eY7z79EhgsgGFmU72XcwnCp+QYP+p97tAPMe9b2+ElAMUY X-Received: by 2002:aa7:de97:: with SMTP id j23mr2279543edv.91.1642040741737; Wed, 12 Jan 2022 18:25:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040741; cv=none; d=google.com; s=arc-20160816; b=hUN3F8KSNzOyNIypIJNFeujGtRJNQCNLCgDYDU+9M2swof15rN1D3pWiG6u++jboez cf/U66JyCVVR11kaab6vBjw5v5aH/gOBMOkclANPh0gk6cKDehp/hf9GMM5j5ChNz2QW FUl9EdeftUpWIr50QRXUNh3IC9PR/UgUxkvDeTDJzehvwFuSMm+K0EgMR46HesvLeXTS odyPcy6NJ1bk53krEZysi8l/YPjPSEbSkbxAd08/PzpgIvwd9/poRSRYnG0JmMaBqUfz UhUL4Wxq1JDxwM84x5mt8VV8WgHbn4ZFc3GIS+FO4+Da0xi+Pf+GaY1j/tMWPigcG1Py BT7g== 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=IXbpX7elecfGf8fvR3S+/jsIzYRJ4uv1PBIb0iO2FTI=; b=ZbC/KGlB/IAY0wHmWR7E0+4V24j+RYw3GsImJ4fNIux1ow2mwq2kbKLgvIw06lU700 rTQ/JlsjBdLVge+4mFgIpSpuB16sWcDJDR3Vdxh9fA5zskUG28ZY1Q2LpEODHJVlPz+O /E5A3uSCh1L73XyWF6j833Dk+5Yu9YMLLdS8tIIPT6BpRyXvdsKlcFwgV5AAIDJ79Hlm oveCuf6aH4IaqEACnYFO2yldmsg5+jAkhJ0jD705eN1x6CO1kwdrZ5eLo/niKGHtvoUs Iccp3BB+J7pKS1rH3Awwip6wCssXWgyWpMQkCMut3TawAHsFUD9jo9kUWmoZ+J7yHD5U GUWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Fq/cbBBr"; 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 z11si837733edp.459.2022.01.12.18.25.41; Wed, 12 Jan 2022 18:25:41 -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="Fq/cbBBr"; 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 6D52568B45D; Thu, 13 Jan 2022 04:01:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2637468B44E for ; Thu, 13 Jan 2022 04:01:08 +0200 (EET) Received: by mail-qk1-f172.google.com with SMTP id t66so5578557qkb.4 for ; Wed, 12 Jan 2022 18:01:08 -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=hkAjN9UjdiYoCqagTfS73fddnMBk35u0ko9RXYuNGxI=; b=Fq/cbBBrnJsL5EXdA3qFkHtTlZ7jrshT2xvKtcGCoUCsEcgDozzQF8+DJcyNcFsq67 v4Lg6sodq1YtRD4cCwpXKcW4xBAjs2C/WoFT4cqPXD7K9CbgE86PgxjPTvDyhd1Y7878 TawUkF/0qQ3t9BO2jwrCGpKMMpc7LNfsHKqCT3xMCGZE1Oavx6hL2BpDVRA2BO5EFQGJ oNOn1lrPGlrUj9OiCjNFylmTywaVT7kxRsmvn27bWlFqRt/oOysA68pwAMzuAU25GvWB JZpT6YNPzD/7/0/FSb93D2nY3kyK3WrA+l33uZEK8ROEXJ7yeGqjU2/jdGVx+rp1HehF ZTpA== 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=hkAjN9UjdiYoCqagTfS73fddnMBk35u0ko9RXYuNGxI=; b=o5oaXrdcDQRdoiSEGedQKh7XSizEEpg1kn41pXOjCoxEgPdCng2wsO43/bq1IwjyMw q00TKudLeIbGGdiKIHO4LVfRfK8kXRcerxLwEnyiNFiuti9dNaMI3D3t6vWgqIZwQqW8 ak78DkRCS6o3JQWGe6BDN4s7kGPjNgLWBkPGtjVghXgvbb73kbXwpyWILSvf2U7dr1bt 0GNIgjoqwWc7ebZkHtdDtKl6MiJcqYWew0eWzCjH6shpCmutaIJSl748AfydfOXSu5cy WjYOhBj+Eh8UaIaozNaq75uJap3ZRrlBCH/Eq+fl9a2o75vYCjpvTpxnYsClWSmxVgJ6 XfCw== X-Gm-Message-State: AOAM530zE6aIpJbzW41Ts4locuKGfZ/UlDXJc4Se0KAqxahxcZG/8a/B lGAeBwUNw0gwFefYeV+6j7zxHWetPKg= X-Received: by 2002:a05:620a:d95:: with SMTP id q21mr1835422qkl.178.1642039267523; Wed, 12 Jan 2022 18:01:07 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:07 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:59:59 -0300 Message-Id: <20220113020026.590-4-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 152/281] svag: 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: PHE+RrVwssgQ From: Anton Khirnov Signed-off-by: James Almer --- libavformat/svag.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/svag.c b/libavformat/svag.c index 0774eae112..e907dc6adc 100644 --- a/libavformat/svag.c +++ b/libavformat/svag.c @@ -47,14 +47,16 @@ static int svag_read_header(AVFormatContext *s) st->codecpar->sample_rate = avio_rl32(s->pb); if (st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; - st->codecpar->channels = avio_rl32(s->pb); - if (st->codecpar->channels <= 0 || st->codecpar->channels > 8) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb); + if (st->codecpar->ch_layout.nb_channels <= 0 || + st->codecpar->ch_layout.nb_channels > 8) return AVERROR_INVALIDDATA; - st->duration = size / (16 * st->codecpar->channels) * 28; + st->duration = size / (16 * st->codecpar->ch_layout.nb_channels) * 28; align = avio_rl32(s->pb); - if (align <= 0 || align > INT_MAX / st->codecpar->channels) + if (align <= 0 || align > INT_MAX / st->codecpar->ch_layout.nb_channels) return AVERROR_INVALIDDATA; - st->codecpar->block_align = align * st->codecpar->channels; + st->codecpar->block_align = align * st->codecpar->ch_layout.nb_channels; avio_skip(s->pb, 0x800 - avio_tell(s->pb)); avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);